Mercurial > hg > pyhgsh
diff tests/test-merge2.out @ 808:8f5637f0a0c0
Merge with TAH
| author | mpm@selenic.com |
|---|---|
| date | Sat, 30 Jul 2005 08:35:29 -0800 |
| parents | 61ed30e82b27 1f9ec150a476 |
| children | 0902ffece4b4 |
line wrap: on
line diff
--- a/tests/test-merge2.out Sat Jul 30 08:30:12 2005 -0800 +++ b/tests/test-merge2.out Sat Jul 30 08:35:29 2005 -0800 @@ -1,49 +1,25 @@ -+ mkdir t -+ cd t + hg init -+ echo This is file a1 + hg add a -+ hg commit -m 'commit #0' -d '0 0' -+ echo This is file b1 ++ hg commit -m commit #0 -d 0 0 + hg add b -+ hg commit -m 'commit #1' -d '0 0' -+ rm b ++ hg commit -m commit #1 -d 0 0 + hg update 0 -+ echo This is file b2 + hg add b -+ hg commit -m 'commit #2' -d '0 0' -+ cd .. -+ /bin/rm -rf t -+ mkdir t -+ cd t ++ hg commit -m commit #2 -d 0 0 + hg init -+ echo This is file a1 + hg add a -+ hg commit -m 'commit #0' -d '0 0' -+ echo This is file b1 ++ hg commit -m commit #0 -d 0 0 + hg add b -+ hg commit -m 'commit #1' -d '0 0' -+ rm b ++ hg commit -m commit #1 -d 0 0 + hg update 0 -+ echo This is file b2 -+ hg commit -A -m 'commit #2' -d '0 0' ++ hg commit -A -m commit #2 -d 0 0 adding b -+ cd .. -+ /bin/rm -rf t -+ mkdir t -+ cd t + hg init -+ echo This is file a1 + hg add a -+ hg commit -m 'commit #0' -d '0 0' -+ echo This is file b1 ++ hg commit -m commit #0 -d 0 0 + hg add b -+ hg commit -m 'commit #1' -d '0 0' -+ rm b ++ hg commit -m commit #1 -d 0 0 + hg remove b + hg update 0 -+ echo This is file b2 -+ hg commit -A -m 'commit #2' -d '0 0' ++ hg commit -A -m commit #2 -d 0 0 adding b -+ cd .. -+ /bin/rm -rf t