Show More
@@ -273,6 +273,8 b' def unamend(ui, repo, **opts):' | |||||
273 | curctx = repo[b'.'] |
|
273 | curctx = repo[b'.'] | |
274 |
|
274 | |||
275 | rewriteutil.precheck(repo, [curctx.rev()], b'unamend') |
|
275 | rewriteutil.precheck(repo, [curctx.rev()], b'unamend') | |
|
276 | if len(curctx.parents()) > 1: | |||
|
277 | raise error.InputError(_(b"cannot unamend merge changeset")) | |||
276 |
|
278 | |||
277 | # identify the commit to which to unamend |
|
279 | # identify the commit to which to unamend | |
278 | markers = list(predecessormarkers(curctx)) |
|
280 | markers = list(predecessormarkers(curctx)) |
@@ -443,8 +443,5 b' Try to unamend a merge' | |||||
443 | A left |
|
443 | A left | |
444 | $ hg amend |
|
444 | $ hg amend | |
445 | $ hg unamend |
|
445 | $ hg unamend | |
446 | $ hg st --rev 1 --rev . |
|
446 | abort: cannot unamend merge changeset | |
447 | A right |
|
447 | [10] | |
448 | R left (known-bad-output !) |
|
|||
449 | $ hg st --rev 2 --rev . |
|
|||
450 | A left (missing-correct-output !) |
|
General Comments 0
You need to be logged in to leave comments.
Login now