Mercurial > hg
diff tests/test-graft.t @ 30581:43a9e02a7b7f
graft: support grafting changes to new file in renamed directory (issue5436)
author | Gábor Stefanik <gabor.stefanik@nng.com> |
---|---|
date | Mon, 05 Dec 2016 17:40:01 +0100 |
parents | ce3a133f71b3 |
children | 52dabcc49968 |
line wrap: on
line diff
--- a/tests/test-graft.t Mon Nov 28 05:45:22 2016 +0000 +++ b/tests/test-graft.t Mon Dec 05 17:40:01 2016 +0100 @@ -1286,3 +1286,28 @@ $ hg ci -qAmc $ hg up -q .~2 $ hg graft tip -qt:fail + + $ cd .. + +Graft a change into a new file previously grafted into a renamed directory + + $ hg init dirmovenewfile + $ cd dirmovenewfile + $ mkdir a + $ echo a > a/a + $ hg ci -qAma + $ echo x > a/x + $ hg ci -qAmx + $ hg up -q 0 + $ hg mv -q a b + $ hg ci -qAmb + $ hg graft -q 1 # a/x grafted as b/x, but no copy information recorded + $ hg up -q 1 + $ echo y > a/x + $ hg ci -qAmy + $ hg up -q 3 + $ hg graft -q 4 + $ hg status --change . + M b/x + + $ cd ..