Show More
@@ -679,6 +679,8 b' def between(repo, old, new, keep):' | |||
|
679 | 679 | if (not obsolete._enabled and |
|
680 | 680 | repo.revs('(%ld::) - (%ld)', ctxs, ctxs)): |
|
681 | 681 | raise util.Abort(_('cannot edit history that would orphan nodes')) |
|
682 | if repo.revs('(%ld) and merge()', ctxs): | |
|
683 | raise util.Abort(_('cannot edit history that contains merges')) | |
|
682 | 684 | root = ctxs[0] # list is already sorted by repo.set |
|
683 | 685 | if not root.phase(): |
|
684 | 686 | raise util.Abort(_('cannot edit immutable changeset: %s') % root) |
@@ -441,4 +441,19 b' Note that there is a few reordering in t' | |||
|
441 | 441 | | |
|
442 | 442 | o 0:cb9a9f314b8b (public) a |
|
443 | 443 | |
|
444 | $ hg co 18 | |
|
445 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
446 | $ echo wat >> wat | |
|
447 | $ hg add wat | |
|
448 | $ hg ci -m 'add wat' | |
|
449 | created new head | |
|
450 | $ hg merge 19 | |
|
451 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
452 | (branch merge, don't forget to commit) | |
|
453 | $ hg ci -m 'merge' | |
|
454 | $ echo not wat > wat | |
|
455 | $ hg ci -m 'modify wat' | |
|
456 | $ hg histedit 17 | |
|
457 | abort: cannot edit history that contains merges | |
|
458 | [255] | |
|
444 | 459 |
$ |
General Comments 0
You need to be logged in to leave comments.
Login now