tests/test-merge5.out
author mpm@selenic.com
Thu, 14 Jul 2005 18:41:36 -0800
changeset 693 10c0264751da
parent 616 d45d1c90032e
child 749 7e4843b7efd2
permissions -rw-r--r--
Be quiet about broken pipes manifest hash: 3163ebe2f15c3a577456cfdcd2b136c3c7cf7378

+ 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