tests/test-merge5.out
author mpm@selenic.com
Wed, 22 Jun 2005 11:31:24 -0800
changeset 435 e731d25ddab2
parent 415 c2b9502a4e96
child 616 d45d1c90032e
permissions -rw-r--r--
Fix a compile warning for bdiff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix a compile warning for bdiff manifest hash: 263a8d670a4960f57b6738d41b40626efe1d90d5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD4DBQFCubyMywK+sNU5EO8RAvw5AJ4usI49PlchNMgytp29Fajf+6aGfgCY/7YV PBZf1pfbBH3nO0gEi33CNg== =cw8/ -----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