tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Wed, 06 Jul 2005 22:37:06 -0800
changeset 647 732ca4b56b7f
parent 616 d45d1c90032e
child 749 7e4843b7efd2
permissions -rw-r--r--
update test-hup permissions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update test-hup permissions manifest hash: a041df3958fb7508e34ce7c736c196217bbcf8a7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzM2SywK+sNU5EO8RAnKvAKC1+ilD53KpBwplk5iaUMra4h3GDgCgsM4f R+RswPBjW8I51vNyvZ45AvM= =dQjV -----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:
 b
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0