Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.py @ 9783:ee00ef6f9be7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
submerge: properly deal with overwrites also pull .hgsubstate check out of inner loop
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Nov 2009 10:29:52 -0600
parents c1c40511c276
children 30d51a0df46c 8f14f749f471
line wrap: on
line diff
--- a/mercurial/subrepo.py	Sun Nov 08 10:24:18 2009 -0600
+++ b/mercurial/subrepo.py	Sun Nov 08 10:29:52 2009 -0600
@@ -60,7 +60,7 @@
         repo.ui.debug("  subrepo %s: %s %s\n" % (s, msg, r))
 
     for s, l in s1.items():
-        if wctx.sub(s).dirty():
+        if wctx != actx and wctx.sub(s).dirty():
             l = (l[0], l[1] + "+")
         a = sa.get(s, nullstate)
         if s in s2: