tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 22 Jul 2005 08:11:49 +0100
changeset 756 5d79dfa5e98f
parent 749 7e4843b7efd2
child 767 61ed30e82b27
permissions -rw-r--r--
Added new code contributors, fixed Vincent's name, added hint on encoding.

+ 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'
+ 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