Mercurial > hg
diff tests/test-merge1.out @ 749:7e4843b7efd2
Update tests to use commit -m and default -u
manifest hash: 6e4385453843031a712005a320d6000595b40d05
| author | mpm@selenic.com |
|---|---|
| date | Thu, 21 Jul 2005 15:05:17 -0500 |
| parents | 5b22029b5aa2 |
| children | 1f9ec150a476 8f5637f0a0c0 0902ffece4b4 |
line wrap: on
line diff
--- a/tests/test-merge1.out Thu Jul 21 12:40:28 2005 -0500 +++ b/tests/test-merge1.out Thu Jul 21 15:05:17 2005 -0500 @@ -5,14 +5,14 @@ + hg init + echo This is file a1 + hg add a -+ hg commit -t 'commit #0' -d '0 0' -u user ++ hg commit -m 'commit #0' -d '0 0' + echo This is file b1 + hg add b -+ hg commit -t 'commit #1' -d '0 0' -u user ++ hg commit -m 'commit #1' -d '0 0' + hg update 0 + echo This is file c1 + hg add c -+ hg commit -t 'commit #2' -d '0 0' -u user ++ hg commit -m 'commit #2' -d '0 0' + echo This is file b1 + env HGMERGE=../merge hg update -m 1 + cd .. @@ -22,14 +22,14 @@ + hg init + echo This is file a1 + hg add a -+ hg commit -t 'commit #0' -d '0 0' -u user ++ hg commit -m 'commit #0' -d '0 0' + echo This is file b1 + hg add b -+ hg commit -t 'commit #1' -d '0 0' -u user ++ hg commit -m 'commit #1' -d '0 0' + hg update 0 + echo This is file c1 + hg add c -+ hg commit -t 'commit #2' -d '0 0' -u user ++ hg commit -m 'commit #2' -d '0 0' + echo This is file b2 + env HGMERGE=../merge hg update -m 1 merging for b @@ -41,16 +41,16 @@ + hg init + echo This is file a1 + hg add a -+ hg commit -t 'commit #0' -d '0 0' -u user ++ hg commit -m 'commit #0' -d '0 0' + echo This is file b1 + hg add b -+ hg commit -t 'commit #1' -d '0 0' -u user ++ hg commit -m 'commit #1' -d '0 0' + echo This is file b22 -+ hg commit -t 'commit #2' -d '0 0' -u user ++ hg commit -m 'commit #2' -d '0 0' + hg update 1 + echo This is file c1 + hg add c -+ hg commit -t 'commit #3' -d '0 0' -u user ++ hg commit -m 'commit #3' -d '0 0' + cat b This is file b1 + echo This is file b22 @@ -64,16 +64,16 @@ + hg init + echo This is file a1 + hg add a -+ hg commit -t 'commit #0' -d '0 0' -u user ++ hg commit -m 'commit #0' -d '0 0' + echo This is file b1 + hg add b -+ hg commit -t 'commit #1' -d '0 0' -u user ++ hg commit -m 'commit #1' -d '0 0' + echo This is file b22 -+ hg commit -t 'commit #2' -d '0 0' -u user ++ hg commit -m 'commit #2' -d '0 0' + hg update 1 + echo This is file c1 + hg add c -+ hg commit -t 'commit #3' -d '0 0' -u user ++ hg commit -m 'commit #3' -d '0 0' + echo This is file b33 + env HGMERGE=../merge hg update -m 2 merging for b