Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 873:4480e035d838
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
===================================================================
author | mason@suse.com |
---|---|
date | Fri, 12 Aug 2005 09:57:59 -0800 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
line wrap: on
line source
+ hg init + hg add a + hg commit -m ancestor -d 0 0 + hg commit -m branch1 -d 0 0 + hg co 0 + hg commit -m branch2 -d 0 0 + hg up -m 1 merge: warning: conflicts during merge merging a merging a failed! + hg id 32e80765d7fe+75234512624c+ tip something else ======= something + hg status M a