Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 11101:502474839293

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: only scan unknowns when needed
author Matt Mackall <mpm@selenic.com>
date Wed, 05 May 2010 20:21:57 -0500
parents 7a0d096e221e
children 21a7ae13208f
line wrap: on
line diff
--- a/mercurial/merge.py	Tue May 04 15:52:42 2010 -0500
+++ b/mercurial/merge.py	Wed May 05 20:21:57 2010 -0500
@@ -491,6 +491,7 @@
 
         ### calculate phase
         action = []
+        wc.status(unknown=True) # prime cache
         if not force:
             _checkunknown(wc, p2)
         if not util.checkcase(repo.path):