tests/test-merge5.out
author Kyle Moffett <mrmacman_g4@mac.com>
Thu, 04 Aug 2005 13:22:36 -0800
changeset 826 16700cdd9055
parent 824 0932bc2fb2be
child 836 1fe3b14c7044
child 839 9c918287d10b
permissions -rw-r--r--
Allow import from files with spaces Index: hg/mercurial/commands.py ===================================================================

+ hg init
+ hg add a b
+ hg commit -m commit #0 -d 0 0
+ hg commit -mcomment #1 -d 0 0
+ hg update 0
+ hg commit -A -mcomment #2 -d 0 0
removing b
+ hg update 1
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)