equal
deleted
inserted
replaced
759 raise error.Abort(_(b'specified revisions evaluate to an empty set'), |
759 raise error.Abort(_(b'specified revisions evaluate to an empty set'), |
760 hint=_(b'use different revision arguments')) |
760 hint=_(b'use different revision arguments')) |
761 elif len(revs) == 1: |
761 elif len(revs) == 1: |
762 ui.write_err(_(b'single revision specified, nothing to fold\n')) |
762 ui.write_err(_(b'single revision specified, nothing to fold\n')) |
763 return 1 |
763 return 1 |
|
764 |
|
765 if not ui.configbool(b'experimental', b'evolution.allowdivergence'): |
|
766 for rev in revs: |
|
767 if repo[rev].obsolete(): |
|
768 msg = _(b'folding obsolete revisions may cause divergence') |
|
769 hint = _(b'set experimental.evolution.allowdivergence=yes' |
|
770 b' to allow folding them') |
|
771 raise error.Abort(msg, hint=hint) |
764 |
772 |
765 # Sort so combined commit message of `hg fold --exact -r . -r .^` is |
773 # Sort so combined commit message of `hg fold --exact -r . -r .^` is |
766 # in topological order. |
774 # in topological order. |
767 revs.sort() |
775 revs.sort() |
768 |
776 |