Mercurial > hg > pyhgsh
diff tests/test-merge2 @ 409:feadc9697b43
Pick up tests from previous patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Pick up tests from previous patch
manifest hash: 3ec4c3cb96e15322f7489d89b7b92ee214f6cfb9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuNIaywK+sNU5EO8RAuGOAJ9YXXfXstC6wysknsXPAL9jDeiUDwCgpFJ3
P5goy7Zw3ypinBEwZrhgXM8=
=6fKs
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Tue, 21 Jun 2005 18:51:06 -0800 |
| parents | |
| children | 7e4843b7efd2 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge2 Tue Jun 21 18:51:06 2005 -0800 @@ -0,0 +1,48 @@ +#!/bin/sh -x + +mkdir t +cd t +hg init +echo This is file a1 > a +hg add a +hg commit -t "commit #0" -d "0 0" -u user +echo This is file b1 > b +hg add b +hg commit -t "commit #1" -d "0 0" -u user +rm b +hg update 0 +echo This is file b2 > b +hg add b +hg commit -t "commit #2" -d "0 0" -u user +cd ..; /bin/rm -rf t + +mkdir t +cd t +hg init +echo This is file a1 > a +hg add a +hg commit -t "commit #0" -d "0 0" -u user +echo This is file b1 > b +hg add b +hg commit -t "commit #1" -d "0 0" -u user +rm b +hg update 0 +echo This is file b2 > b +hg commit -A -t "commit #2" -d "0 0" -u user +cd ..; /bin/rm -rf t + +mkdir t +cd t +hg init +echo This is file a1 > a +hg add a +hg commit -t "commit #0" -d "0 0" -u user +echo This is file b1 > b +hg add b +hg commit -t "commit #1" -d "0 0" -u user +rm b +hg remove b +hg update 0 +echo This is file b2 > b +hg commit -A -t "commit #2" -d "0 0" -u user +cd ..; /bin/rm -rf t