Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.out @ 2065:2ff37e3bf780
fix update when a locally added file match the target revision
the dirstate entry for the added file wasn't updated.
fix issue207
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 14 Apr 2006 00:41:50 +0200 |
parents | 5c4496ed152d |
children | b2ae81a7df29 |
line wrap: on
line diff
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -136,3 +136,10 @@ diff -r 802f095af299 a @@ -1,1 +1,1 @@ a2 -a2 +abc +adding a +pulling from ../a +requesting all changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files