Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge1 @ 1948:ebe273a16048
merge with crew/templates
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Mon, 13 Mar 2006 23:38:14 +0100 |
| parents | 7544700fd931 |
| children | e506c14382fd |
line wrap: on
line diff
--- a/tests/test-merge1 +++ b/tests/test-merge1 @@ -11,15 +11,15 @@ cd t hg init echo This is file a1 > a hg add a -hg commit -m "commit #0" -d "0 0" +hg commit -m "commit #0" -d "1000000 0" echo This is file b1 > b hg add b -hg commit -m "commit #1" -d "0 0" +hg commit -m "commit #1" -d "1000000 0" hg update 0 echo This is file c1 > c hg add c -hg commit -m "commit #2" -d "0 0" +hg commit -m "commit #2" -d "1000000 0" echo This is file b1 > b echo %% no merges expected env HGMERGE=../merge hg update -m 1 @@ -30,15 +30,15 @@ cd t hg init echo This is file a1 > a hg add a -hg commit -m "commit #0" -d "0 0" +hg commit -m "commit #0" -d "1000000 0" echo This is file b1 > b hg add b -hg commit -m "commit #1" -d "0 0" +hg commit -m "commit #1" -d "1000000 0" hg update 0 echo This is file c1 > c hg add c -hg commit -m "commit #2" -d "0 0" +hg commit -m "commit #2" -d "1000000 0" echo This is file b2 > b echo %% merge should fail env HGMERGE=../merge hg update -m 1 @@ -52,16 +52,16 @@ cd t hg init echo This is file a1 > a hg add a -hg commit -m "commit #0" -d "0 0" +hg commit -m "commit #0" -d "1000000 0" echo This is file b1 > b hg add b -hg commit -m "commit #1" -d "0 0" +hg commit -m "commit #1" -d "1000000 0" echo This is file b22 > b -hg commit -m "commit #2" -d "0 0" +hg commit -m "commit #2" -d "1000000 0" hg update 1 echo This is file c1 > c hg add c -hg commit -m "commit #3" -d "0 0" +hg commit -m "commit #3" -d "1000000 0" echo 'Contents of b should be "this is file b1"' cat b @@ -78,16 +78,16 @@ cd t hg init echo This is file a1 > a hg add a -hg commit -m "commit #0" -d "0 0" +hg commit -m "commit #0" -d "1000000 0" echo This is file b1 > b hg add b -hg commit -m "commit #1" -d "0 0" +hg commit -m "commit #1" -d "1000000 0" echo This is file b22 > b -hg commit -m "commit #2" -d "0 0" +hg commit -m "commit #2" -d "1000000 0" hg update 1 echo This is file c1 > c hg add c -hg commit -m "commit #3" -d "0 0" +hg commit -m "commit #3" -d "1000000 0" echo This is file b33 > b echo %% merge of b should fail env HGMERGE=../merge hg update -m 2