tests/test-merge4.out
author mpm@selenic.com
Wed, 29 Jun 2005 10:49:07 -0800
changeset 518 b0187336843c
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rw-r--r--
Fix failed clone in current directory -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix failed clone in current directory Spotted by Edouard Gomez. manifest hash: 83fd3bb8056c531f2d696f00c5bd6a61274783eb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwu0jywK+sNU5EO8RAqPiAJ9tCL5PhHoGMTbaQzpt5dl+EkCH9QCgh4WL EOFeD2th0Ucs7Npu3t+VUB0= =p/Ig -----END PGP SIGNATURE-----

+ 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
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -t 'commit #2' -d '0 0' -u user
+ hg update -m 1
+ rm b
+ echo This is file c22
+ hg commit -t 'commit #3' -d '0 0' -u user