Mercurial > public > mercurial-scm > hg

diff 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
line wrap: on
line diff
--- a/tests/test-up-local-change.out	Thu Apr 13 13:46:56 2006 -0700
+++ b/tests/test-up-local-change.out	Fri Apr 14 00:41:50 2006 +0200
@@ -136,3 +136,10 @@
 @@ -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