Mercurial > hg > pyhgsh
diff tests/test-merge2.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 | feadc9697b43 |
| children | 61ed30e82b27 |
line wrap: on
line diff
--- a/tests/test-merge2.out Thu Jul 21 12:40:28 2005 -0500 +++ b/tests/test-merge2.out Thu Jul 21 15:05:17 2005 -0500 @@ -3,15 +3,15 @@ + 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' + rm b + hg update 0 + echo This is file b2 + hg add b -+ hg commit -t 'commit #2' -d '0 0' -u user ++ hg commit -m 'commit #2' -d '0 0' + cd .. + /bin/rm -rf t + mkdir t @@ -19,14 +19,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' + rm b + hg update 0 + echo This is file b2 -+ hg commit -A -t 'commit #2' -d '0 0' -u user ++ hg commit -A -m 'commit #2' -d '0 0' + cd .. + /bin/rm -rf t + mkdir t @@ -34,14 +34,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' + rm b + hg remove b + hg update 0 + echo This is file b2 -+ hg commit -A -t 'commit #2' -d '0 0' -u user ++ hg commit -A -m 'commit #2' -d '0 0' + cd .. + /bin/rm -rf t