Mercurial > hg
diff tests/test-unamend.t @ 41338:c7d425f7f5c9
tests: add more tests of uncommit/unamend with copies
The unamend tests show suboptimal behavior.
Differential Revision: https://phab.mercurial-scm.org/D5658
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 18 Jan 2019 17:08:02 -0800 |
parents | 713fbf057c7d |
children | 19c590ce8661 |
line wrap: on
line diff
--- a/tests/test-unamend.t Fri Jan 18 16:49:18 2019 -0800 +++ b/tests/test-unamend.t Fri Jan 18 17:08:02 2019 -0800 @@ -372,3 +372,40 @@ rename to wat $ hg revert -qa $ rm foobar wat + +Rename a->b, then amend b->c. After unamend, should look like b->c. + + $ hg co -q 0 + $ hg mv a b + $ hg ci -qm 'move to a b' + $ hg mv b c + $ hg amend + $ hg unamend + $ hg st --copies --change . + A b + a + R a +BROKEN: should indicate that b was renamed to c + $ hg st --copies + A c + R b + $ hg revert -qa + $ rm c + +Rename a->b, then amend b->c, and working copy change c->d. After unamend, should look like b->d + + $ hg co -q 0 + $ hg mv a b + $ hg ci -qm 'move to a b' + $ hg mv b c + $ hg amend + $ hg mv c d + $ hg unamend + $ hg st --copies --change . + A b + a + R a +BROKEN: should indicate that b was renamed to d + $ hg st --copies + A d + R b