tests/test-merge4.out
author mpm@selenic.com
Wed, 29 Jun 2005 21:55:25 -0800
changeset 528 648386fabf9c
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rw-r--r--
Fix clone bug wth trailing slash -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix clone bug wth trailing slash manifest hash: ca78730f00063c57b70db69cf9ecfc3f83c02e84 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCw4lNywK+sNU5EO8RApq+AJ9YTl92lLnk9UMvWWSeEue/siS6pACgsg68 FLAc0OVzeULP7ORKRHCtpQI= =IL3R -----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