Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge1 @ 2283:e506c14382fd
deprecate 'update -m'. use 'merge' instead.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sun, 14 May 2006 21:07:34 -0700 |
parents | 7544700fd931 |
children | 49966b5ab16f |
comparison
equal
deleted
inserted
replaced
2282:2efa636eb411 | 2283:e506c14382fd |
---|---|
20 echo This is file c1 > c | 20 echo This is file c1 > c |
21 hg add c | 21 hg add c |
22 hg commit -m "commit #2" -d "1000000 0" | 22 hg commit -m "commit #2" -d "1000000 0" |
23 echo This is file b1 > b | 23 echo This is file b1 > b |
24 echo %% no merges expected | 24 echo %% no merges expected |
25 env HGMERGE=../merge hg update -m 1 | 25 env HGMERGE=../merge hg merge 1 |
26 cd ..; /bin/rm -rf t | 26 cd ..; /bin/rm -rf t |
27 | 27 |
28 mkdir t | 28 mkdir t |
29 cd t | 29 cd t |
30 hg init | 30 hg init |
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 "1000000 0" | 41 hg commit -m "commit #2" -d "1000000 0" |
42 echo This is file b2 > b | 42 echo This is file b2 > b |
43 echo %% merge should fail | 43 echo %% merge should fail |
44 env HGMERGE=../merge hg update -m 1 | 44 env HGMERGE=../merge hg merge 1 |
45 echo %% merge of b expected | 45 echo %% merge of b expected |
46 env HGMERGE=../merge hg update -f -m 1 | 46 env HGMERGE=../merge hg merge -f 1 |
47 cd ..; /bin/rm -rf t | 47 cd ..; /bin/rm -rf t |
48 echo %% | 48 echo %% |
49 | 49 |
50 mkdir t | 50 mkdir t |
51 cd t | 51 cd t |
66 echo 'Contents of b should be "this is file b1"' | 66 echo 'Contents of b should be "this is file b1"' |
67 cat b | 67 cat b |
68 | 68 |
69 echo This is file b22 > b | 69 echo This is file b22 > b |
70 echo %% merge fails | 70 echo %% merge fails |
71 env HGMERGE=../merge hg update -m 2 | 71 env HGMERGE=../merge hg merge 2 |
72 echo %% merge expected! | 72 echo %% merge expected! |
73 env HGMERGE=../merge hg update -f -m 2 | 73 env HGMERGE=../merge hg merge -f 2 |
74 cd ..; /bin/rm -rf t | 74 cd ..; /bin/rm -rf t |
75 | 75 |
76 mkdir t | 76 mkdir t |
77 cd t | 77 cd t |
78 hg init | 78 hg init |
88 echo This is file c1 > c | 88 echo This is file c1 > c |
89 hg add c | 89 hg add c |
90 hg commit -m "commit #3" -d "1000000 0" | 90 hg commit -m "commit #3" -d "1000000 0" |
91 echo This is file b33 > b | 91 echo This is file b33 > b |
92 echo %% merge of b should fail | 92 echo %% merge of b should fail |
93 env HGMERGE=../merge hg update -m 2 | 93 env HGMERGE=../merge hg merge 2 |
94 echo %% merge of b expected | 94 echo %% merge of b expected |
95 env HGMERGE=../merge hg update -f -m 2 | 95 env HGMERGE=../merge hg merge -f 2 |
96 cd ..; /bin/rm -rf t | 96 cd ..; /bin/rm -rf t |