Mercurial > hg > pyhgsh
diff tests/test-up-local-change @ 1674:dee55c4a4963
abort when using 'update -m' and this is not a merge
add more testcases for updating with local changes
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 01 Feb 2006 08:46:24 +0100 |
| parents | db10b7114de0 |
| children | 7544700fd931 |
line wrap: on
line diff
--- a/tests/test-up-local-change Mon Jan 30 19:34:35 2006 +1300 +++ b/tests/test-up-local-change Wed Feb 01 08:46:24 2006 +0100 @@ -24,11 +24,34 @@ cd ../r2 hg -q pull ../r1 hg status +hg parents hg --debug up +hg parents +hg --debug up 0 +hg parents hg --debug up -m || echo failed -hg --debug up -f -m +hg parents +hg --debug up hg parents hg -v history hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" +# create a second head +cd ../r1 +hg up 0 +echo b2 > b +echo a3 > a +hg addremove +hg commit -m "3" -d "0 0" + +cd ../r2 +hg -q pull ../r1 +hg status +hg parents +hg --debug up || echo failed +hg --debug up -m || echo failed +hg --debug up -f -m +hg parents +hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"