##// END OF EJS Templates
histedit: improve error when run on nodes with children (issue5056)
liscju -
r28294:89e04a33 default
parent child Browse files
Show More
@@ -1282,7 +1282,8 b' def between(repo, old, new, keep):'
1282 if ctxs and not keep:
1282 if ctxs and not keep:
1283 if (not obsolete.isenabled(repo, obsolete.allowunstableopt) and
1283 if (not obsolete.isenabled(repo, obsolete.allowunstableopt) and
1284 repo.revs('(%ld::) - (%ld)', ctxs, ctxs)):
1284 repo.revs('(%ld::) - (%ld)', ctxs, ctxs)):
1285 raise error.Abort(_('cannot edit history that would orphan nodes'))
1285 raise error.Abort(_('can only histedit a changeset together '
1286 'with all its descendants'))
1286 if repo.revs('(%ld) and merge()', ctxs):
1287 if repo.revs('(%ld) and merge()', ctxs):
1287 raise error.Abort(_('cannot edit history that contains merges'))
1288 raise error.Abort(_('cannot edit history that contains merges'))
1288 root = ctxs[0] # list is already sorted by repo.set
1289 root = ctxs[0] # list is already sorted by repo.set
General Comments 0
You need to be logged in to leave comments. Login now