equal
deleted
inserted
replaced
145 def debug(s, msg, r=""): |
145 def debug(s, msg, r=""): |
146 if r: |
146 if r: |
147 r = "%s:%s:%s" % r |
147 r = "%s:%s:%s" % r |
148 repo.ui.debug(" subrepo %s: %s %s\n" % (s, msg, r)) |
148 repo.ui.debug(" subrepo %s: %s %s\n" % (s, msg, r)) |
149 |
149 |
150 for s, l in s1.items(): |
150 for s, l in sorted(s1.iteritems()): |
151 a = sa.get(s, nullstate) |
151 a = sa.get(s, nullstate) |
152 ld = l # local state with possible dirty flag for compares |
152 ld = l # local state with possible dirty flag for compares |
153 if wctx.sub(s).dirty(): |
153 if wctx.sub(s).dirty(): |
154 ld = (l[0], l[1] + "+") |
154 ld = (l[0], l[1] + "+") |
155 if wctx == actx: # overwrite |
155 if wctx == actx: # overwrite |