equal
deleted
inserted
replaced
58 if r: |
58 if r: |
59 r = "%s:%s" % r |
59 r = "%s:%s" % r |
60 repo.ui.debug(" subrepo %s: %s %s\n" % (s, msg, r)) |
60 repo.ui.debug(" subrepo %s: %s %s\n" % (s, msg, r)) |
61 |
61 |
62 for s, l in s1.items(): |
62 for s, l in s1.items(): |
63 if wctx.sub(s).dirty(): |
63 if wctx != actx and wctx.sub(s).dirty(): |
64 l = (l[0], l[1] + "+") |
64 l = (l[0], l[1] + "+") |
65 a = sa.get(s, nullstate) |
65 a = sa.get(s, nullstate) |
66 if s in s2: |
66 if s in s2: |
67 r = s2[s] |
67 r = s2[s] |
68 if l == r or r == a: # no change or local is newer |
68 if l == r or r == a: # no change or local is newer |