tests/test-merge2.out
author mpm@selenic.com
Wed, 29 Jun 2005 14:09:33 -0800
changeset 524 230676d0df6f
parent 409 feadc9697b43
child 749 7e4843b7efd2
permissions -rw-r--r--
Fix up test-bad-pull output -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up test-bad-pull output manifest hash: 4ed6670e4f20a0ad9e5b483ccc3003e8bd5c094c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwxwdywK+sNU5EO8RAm4RAJ9MuISeQhLqfxo4/w3WLjk18y6gXwCeMwCf 4nvEMnJCPMyk4MSMfzPnCnQ= =wAOy -----END PGP SIGNATURE-----

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ rm b
+ hg update 0
+ echo This is file b2
+ 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
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ rm b
+ hg update 0
+ echo This is file b2
+ 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
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ 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
+ hg commit -A -t 'commit #2' -d '0 0' -u user
+ cd ..
+ /bin/rm -rf t