tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 20 Jul 2005 03:16:20 -0800
changeset 732 ba0b6d17a6de
parent 616 d45d1c90032e
child 749 7e4843b7efd2
permissions -rw-r--r--
Convert diff command over to using walk code.

+ 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