changeset 9783 | ee00ef6f9be7 |
parent 9782 | c1c40511c276 |
child 10027 | 30d51a0df46c |
child 10068 | 8f14f749f471 |
--- 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: