Mercurial > hg > pyhgsh
view tests/test-merge6.out @ 1488:08c7851969cc
only files in normal state should be marked as deleted
fix a traceback when you removed an added file
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 02 Nov 2005 16:08:48 -0800 |
parents | 9344f5dd4488 |
children | ced2d3620f95 |
line wrap: on
line source
pulling from ../B1 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg update' to get a working copy) bar should remain deleted. f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo pulling from ../A2 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files (+1 heads) (run 'hg update' to get a working copy) bar should remain deleted. f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo