sapling/tests/test-merge5.out
2005-07-22 19:46:02 -08:00

21 lines
422 B
Plaintext

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b22
+ hg commit '-mcomment #1' -d '0 0'
+ hg update 0
+ rm b
+ hg commit -A '-mcomment #2' -d '0 0'
removing b
+ 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