tests/test-merge5.out
author kyle@zeus.moffetthome.net
Fri, 24 Jun 2005 20:53:51 -0500
changeset 463 ea93402b81b9
parent 415 c2b9502a4e96
child 616 d45d1c90032e
permissions -rw-r--r--
Added stdint.h include to fix build on Mac OS X Tiger [v10.4]

+ 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