Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge1 @ 1679:675ca845c2f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 15 Dec 2005 18:04:39 +0100
parents db10b7114de0
children 7544700fd931
comparison
equal deleted inserted replaced
1678:b345cc4c22c0 1679:675ca845c2f8
38 hg update 0 38 hg update 0
39 echo This is file c1 > c 39 echo This is file c1 > c
40 hg add c 40 hg add c
41 hg commit -m "commit #2" -d "0 0" 41 hg commit -m "commit #2" -d "0 0"
42 echo This is file b2 > b 42 echo This is file b2 > b
43 echo %% merge should fail
44 env HGMERGE=../merge hg update -m 1
43 echo %% merge of b expected 45 echo %% merge of b expected
44 env HGMERGE=../merge hg update -m 1 46 env HGMERGE=../merge hg update -f -m 1
45 cd ..; /bin/rm -rf t 47 cd ..; /bin/rm -rf t
46 echo %% 48 echo %%
47 49
48 mkdir t 50 mkdir t
49 cd t 51 cd t
63 65
64 echo 'Contents of b should be "this is file b1"' 66 echo 'Contents of b should be "this is file b1"'
65 cat b 67 cat b
66 68
67 echo This is file b22 > b 69 echo This is file b22 > b
70 echo %% merge fails
71 env HGMERGE=../merge hg update -m 2
68 echo %% merge expected! 72 echo %% merge expected!
69 env HGMERGE=../merge hg update -m 2 73 env HGMERGE=../merge hg update -f -m 2
70 cd ..; /bin/rm -rf t 74 cd ..; /bin/rm -rf t
71 75
72 mkdir t 76 mkdir t
73 cd t 77 cd t
74 hg init 78 hg init
83 hg update 1 87 hg update 1
84 echo This is file c1 > c 88 echo This is file c1 > c
85 hg add c 89 hg add c
86 hg commit -m "commit #3" -d "0 0" 90 hg commit -m "commit #3" -d "0 0"
87 echo This is file b33 > b 91 echo This is file b33 > b
92 echo %% merge of b should fail
93 env HGMERGE=../merge hg update -m 2
88 echo %% merge of b expected 94 echo %% merge of b expected
89 env HGMERGE=../merge hg update -m 2 95 env HGMERGE=../merge hg update -f -m 2
90 cd ..; /bin/rm -rf t 96 cd ..; /bin/rm -rf t