Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 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 a514c7509fa9
children f71e9656524f
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu Apr 13 13:46:56 2006 -0700
+++ b/mercurial/localrepo.py	Fri Apr 14 00:41:50 2006 +0200
@@ -1573,8 +1573,9 @@
                         self.ui.debug(_(" remote %s is newer, get\n") % f)
                         get[f] = m2[f]
                         s = 1
-                elif f in umap:
+                elif f in umap or f in added:
                     # this unknown file is the same as the checkout
+                    # we need to reset the dirstate if the file was added
                     get[f] = m2[f]
 
                 if not s and mfw[f] != mf2[f]: