tests/test-merge5.out
author mpm@selenic.com
Fri, 24 Jun 2005 23:00:19 -0800
changeset 462 512d76558bd4
parent 415 c2b9502a4e96
child 616 d45d1c90032e
permissions -rw-r--r--
Fix pipe timing for copy test -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix pipe timing for copy test manifest hash: 75c389c84f4edacdd9163b6e5234f3ea334ca4b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQEDywK+sNU5EO8RAtGDAJ0QKBXRg8qQ/Vkye9xEatVUREtU1ACcCISd cJDQzk62ukLW2/gcCLOHHMQ= =tpar -----END PGP SIGNATURE-----

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b22
+ hg commit '-tcomment #1' -d '0 0' -u user
+ hg update 0
+ rm b
+ hg commit -A '-tcomment #2' -d '0 0' -u user
+ yes k
+ hg update 1
this update spans a branch affecting the following files:
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0