Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-transplant @ 3726:752884db5037
transplant: recover added/removed files after failed application
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 30 Nov 2006 13:51:58 -0800 |
parents | ea523d6f5f1a |
children | 889f7e74a0d9 |
comparison
equal
deleted
inserted
replaced
3725:ccc7a9eb0e5e | 3726:752884db5037 |
---|---|
65 cat <<EOF > foo | 65 cat <<EOF > foo |
66 foo | 66 foo |
67 bar | 67 bar |
68 baz | 68 baz |
69 EOF | 69 EOF |
70 echo toremove > toremove | |
70 hg ci -Amfoo -d '0 0' | 71 hg ci -Amfoo -d '0 0' |
71 cat <<EOF > foo | 72 cat <<EOF > foo |
72 foo2 | 73 foo2 |
73 bar2 | 74 bar2 |
74 baz2 | 75 baz2 |
75 EOF | 76 EOF |
76 hg ci -mfoo2 -d '0 0' | 77 rm toremove |
78 echo added > added | |
79 hg ci -Amfoo2 -d '0 0' | |
77 echo bar > bar | 80 echo bar > bar |
78 hg ci -Ambar -d '0 0' | 81 hg ci -Ambar -d '0 0' |
79 echo bar2 >> bar | 82 echo bar2 >> bar |
80 hg ci -mbar2 -d '0 0' | 83 hg ci -mbar2 -d '0 0' |
81 hg up 0 | 84 hg up 0 |
82 echo foobar > foo | 85 echo foobar > foo |
83 hg ci -mfoobar -d '0 0' | 86 hg ci -mfoobar -d '0 0' |
84 hg transplant 1:3 | 87 hg transplant 1:3 |
85 echo merge > foo | 88 echo merge > foo |
86 hg transplant --continue | 89 hg transplant --continue |
90 hg locate |