Show More
@@ -421,3 +421,30 b' Rename a->b, then amend b->c, and workin' | |||
|
421 | 421 | A d |
|
422 | 422 | b |
|
423 | 423 | R b |
|
424 | ||
|
425 | Try to unamend a merge | |
|
426 | ||
|
427 | $ cd .. | |
|
428 | $ hg init merge | |
|
429 | $ cd merge | |
|
430 | $ echo initial > initial | |
|
431 | $ hg ci -Aqm initial | |
|
432 | $ echo left > left | |
|
433 | $ hg ci -Aqm left | |
|
434 | $ hg co -q 0 | |
|
435 | $ echo right > right | |
|
436 | $ hg ci -Aqm right | |
|
437 | $ hg merge -q 1 | |
|
438 | $ hg ci -m merge | |
|
439 | $ echo accidental > initial | |
|
440 | $ hg st --rev 1 --rev . | |
|
441 | A right | |
|
442 | $ hg st --rev 2 --rev . | |
|
443 | A left | |
|
444 | $ hg amend | |
|
445 | $ hg unamend | |
|
446 | $ hg st --rev 1 --rev . | |
|
447 | A right | |
|
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