tests/test-merge5.out
author mason@suse.com
Fri, 12 Aug 2005 07:12:08 -0800
changeset 880 409a9a7b0da2
parent 839 9c918287d10b
child 925 5a034646e472
permissions -rw-r--r--
addremove was not correctly finding removed files when given a list of files to look at. These end up with a src of 'f' from walk() but no longer exist on the filesystem. Index: mine/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)