equal
deleted
inserted
replaced
78 |
78 |
79 newunstable = disallowednewunstable(repo, revs) |
79 newunstable = disallowednewunstable(repo, revs) |
80 if newunstable: |
80 if newunstable: |
81 hint = _(b"see 'hg help evolution.instability'") |
81 hint = _(b"see 'hg help evolution.instability'") |
82 raise error.InputError( |
82 raise error.InputError( |
83 _(b"cannot %s changeset with children") % action, hint=hint |
83 _(b"cannot %s changeset, as that will orphan %d descendants") |
|
84 % (action, len(newunstable)), |
|
85 hint=hint, |
84 ) |
86 ) |
85 |
87 |
86 if not obsolete.isenabled(repo, obsolete.allowdivergenceopt): |
88 if not obsolete.isenabled(repo, obsolete.allowdivergenceopt): |
87 new_divergence = _find_new_divergence(repo, revs) |
89 new_divergence = _find_new_divergence(repo, revs) |
88 if new_divergence: |
90 if new_divergence: |