Mercurial > public > mercurial-scm > hg

diff mercurial/localrepo.py @ 2085:f71e9656524f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge revlogng with mpm tip
author Chris Mason <mason@suse.com>
date Tue, 18 Apr 2006 19:50:12 -0400
parents 856f0ba200bc 2ff37e3bf780
children 190c6a81e6ad
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon Apr 17 13:19:58 2006 -0400
+++ b/mercurial/localrepo.py	Tue Apr 18 19:50:12 2006 -0400
@@ -1594,8 +1594,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]: