Mercurial > hg
view tests/test-merge6.out @ 880:409a9a7b0da2
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 07:12:08 -0800 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
line wrap: on
line source
+ hg init + hg add foo bar + hg commit -m commit text -d 0 0 + hg clone A1 B1 + hg remove bar + hg commit -m commit test -d 0 0 + hg commit -m commit test -d 0 0 + hg clone A1 A2 + hg clone B1 B2 + hg pull ../B1 pulling from ../B1 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) + hg update -m + hg commit -m commit test -d 0 0 bar should remain deleted. + hg manifest 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo + hg pull ../A2 pulling from ../A2 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files (run 'hg update' to get a working copy) + hg update -m + hg commit -m commit test -d 0 0 bar should remain deleted. + hg manifest 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo