Mercurial > hg > gitweb
comparison tests/test-backout @ 2614:8ba1c31f6864
backout: allow backout of merge changeset with --parent option.
--parent allows to choose which parent of merge to revert to.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Fri, 14 Jul 2006 23:19:15 -0700 |
| parents | 2f4addf56715 |
| children | 46280c004f22 |
comparison
equal
deleted
inserted
replaced
| 2613:479e26afa10f | 2614:8ba1c31f6864 |
|---|---|
| 58 echo 1 > b | 58 echo 1 > b |
| 59 hg commit -d '2 0' -A -m c | 59 hg commit -d '2 0' -A -m c |
| 60 hg backout -d '3 0' 1 | 60 hg backout -d '3 0' 1 |
| 61 hg locate b | 61 hg locate b |
| 62 | 62 |
| 63 cd .. | |
| 64 hg init m | |
| 65 cd m | |
| 66 echo a > a | |
| 67 hg commit -d '0 0' -A -m a | |
| 68 echo b > b | |
| 69 hg commit -d '1 0' -A -m b | |
| 70 echo c > c | |
| 71 hg commit -d '2 0' -A -m b | |
| 72 hg update 1 | |
| 73 echo d > d | |
| 74 hg commit -d '3 0' -A -m c | |
| 75 hg merge 2 | |
| 76 hg commit -d '4 0' -A -m d | |
| 77 | |
| 78 echo '# backout of merge should fail' | |
| 79 | |
| 80 hg backout 4 | |
| 81 | |
| 82 echo '# backout of merge with bad parent should fail' | |
| 83 | |
| 84 hg backout --parent 0 4 | |
| 85 | |
| 86 echo '# backout of non-merge with parent should fail' | |
| 87 | |
| 88 hg backout --parent 0 3 | |
| 89 | |
| 90 echo '# backout with valid parent should be ok' | |
| 91 | |
| 92 hg backout -d '5 0' --parent 2 4 | |
| 93 | |
| 94 hg rollback | |
| 95 hg update -C | |
| 96 | |
| 97 hg backout -d '6 0' --parent 3 4 | |
| 98 | |
| 63 exit 0 | 99 exit 0 |