view tests/test-merge5.out @ 762:312b4a10d862

Changed more occurances of 'text' to 'message'.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 22 Jul 2005 16:26:46 +0100
parents 7e4843b7efd2
children 61ed30e82b27
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'
+ 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