Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-transplant @ 3758:889f7e74a0d9
transplant: log source node when recovering too.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Fri, 01 Dec 2006 15:00:33 -0800 |
| parents | 752884db5037 |
| children | 9bd078ce8de9 |
comparison
equal
deleted
inserted
replaced
| 3757:faed44bab17b | 3758:889f7e74a0d9 |
|---|---|
| 83 hg ci -mbar2 -d '0 0' | 83 hg ci -mbar2 -d '0 0' |
| 84 hg up 0 | 84 hg up 0 |
| 85 echo foobar > foo | 85 echo foobar > foo |
| 86 hg ci -mfoobar -d '0 0' | 86 hg ci -mfoobar -d '0 0' |
| 87 hg transplant 1:3 | 87 hg transplant 1:3 |
| 88 echo merge > foo | 88 # transplant -c shouldn't use an old changeset |
| 89 hg up -C | |
| 90 hg transplant 1 | |
| 89 hg transplant --continue | 91 hg transplant --continue |
| 92 hg transplant 1:3 | |
| 90 hg locate | 93 hg locate |