Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
1667:daff3ef0de8d | 1674:dee55c4a4963 |
---|---|
22 hg commit -m "2" -d "0 0" | 22 hg commit -m "2" -d "0 0" |
23 | 23 |
24 cd ../r2 | 24 cd ../r2 |
25 hg -q pull ../r1 | 25 hg -q pull ../r1 |
26 hg status | 26 hg status |
27 hg parents | |
27 hg --debug up | 28 hg --debug up |
29 hg parents | |
30 hg --debug up 0 | |
31 hg parents | |
28 hg --debug up -m || echo failed | 32 hg --debug up -m || echo failed |
29 hg --debug up -f -m | 33 hg parents |
34 hg --debug up | |
30 hg parents | 35 hg parents |
31 hg -v history | 36 hg -v history |
32 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | 37 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
33 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | 38 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
34 | 39 |
40 # create a second head | |
41 cd ../r1 | |
42 hg up 0 | |
43 echo b2 > b | |
44 echo a3 > a | |
45 hg addremove | |
46 hg commit -m "3" -d "0 0" | |
47 | |
48 cd ../r2 | |
49 hg -q pull ../r1 | |
50 hg status | |
51 hg parents | |
52 hg --debug up || echo failed | |
53 hg --debug up -m || echo failed | |
54 hg --debug up -f -m | |
55 hg parents | |
56 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
57 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |