Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-backout @ 2492:2f4addf56715
Test case for #295
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Fri, 23 Jun 2006 17:21:04 -0700 |
parents | 1092533fd11c |
children | 8ba1c31f6864 |
comparison
equal
deleted
inserted
replaced
2491:ffde9eb23f59 | 2492:2f4addf56715 |
---|---|
46 | 46 |
47 hg backout --merge -d '3 0' 1 | 47 hg backout --merge -d '3 0' 1 |
48 hg commit -d '4 0' -m d | 48 hg commit -d '4 0' -m d |
49 cat a | 49 cat a |
50 | 50 |
51 echo '# backout should not back out subsequent changesets' | |
52 hg init onecs | |
53 cd onecs | |
54 echo 1 > a | |
55 hg commit -d '0 0' -A -m a | |
56 echo 2 >> a | |
57 hg commit -d '1 0' -m b | |
58 echo 1 > b | |
59 hg commit -d '2 0' -A -m c | |
60 hg backout -d '3 0' 1 | |
61 hg locate b | |
62 | |
51 exit 0 | 63 exit 0 |