Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 2065:2ff37e3bf780

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
2064:547ede0123a2 2065:2ff37e3bf780
134 --- a/a 134 --- a/a
135 +++ b/a 135 +++ b/a
136 @@ -1,1 +1,1 @@ a2 136 @@ -1,1 +1,1 @@ a2
137 -a2 137 -a2
138 +abc 138 +abc
139 adding a
140 pulling from ../a
141 requesting all changes
142 adding changesets
143 adding manifests
144 adding file changes
145 added 1 changesets with 1 changes to 1 files