view tests/test-merge5.out @ 776:7635a3f14ad4

Add template to mktemp call Based on a patch from Soh Tk-r28629
author mpm@selenic.com
date Tue, 26 Jul 2005 19:27:05 -0800
parents 61ed30e82b27
children 1f9ec150a476 8f5637f0a0c0 0902ffece4b4
line wrap: on
line source

+ 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