Mercurial > hg
diff hgext/histedit.py @ 28294:89e04a33e958
histedit: improve error when run on nodes with children (issue5056)
author | liscju <piotr.listkiewicz@gmail.com> |
---|---|
date | Mon, 29 Feb 2016 15:12:26 +0100 |
parents | 8ec5478aa0d6 |
children | c100dbd593e2 |
line wrap: on
line diff
--- a/hgext/histedit.py Tue Mar 01 11:51:46 2016 +0000 +++ b/hgext/histedit.py Mon Feb 29 15:12:26 2016 +0100 @@ -1282,7 +1282,8 @@ if ctxs and not keep: if (not obsolete.isenabled(repo, obsolete.allowunstableopt) and repo.revs('(%ld::) - (%ld)', ctxs, ctxs)): - raise error.Abort(_('cannot edit history that would orphan nodes')) + raise error.Abort(_('can only histedit a changeset together ' + 'with all its descendants')) if repo.revs('(%ld) and merge()', ctxs): raise error.Abort(_('cannot edit history that contains merges')) root = ctxs[0] # list is already sorted by repo.set