equal
deleted
inserted
replaced
143 r = "%s:%s:%s" % r |
143 r = "%s:%s:%s" % r |
144 repo.ui.debug(" subrepo %s: %s %s\n" % (s, msg, r)) |
144 repo.ui.debug(" subrepo %s: %s %s\n" % (s, msg, r)) |
145 |
145 |
146 promptssrc = filemerge.partextras(labels) |
146 promptssrc = filemerge.partextras(labels) |
147 for s, l in sorted(s1.iteritems()): |
147 for s, l in sorted(s1.iteritems()): |
148 prompts = None |
|
149 a = sa.get(s, nullstate) |
148 a = sa.get(s, nullstate) |
150 ld = l # local state with possible dirty flag for compares |
149 ld = l # local state with possible dirty flag for compares |
151 if wctx.sub(s).dirty(): |
150 if wctx.sub(s).dirty(): |
152 ld = (l[0], l[1] + "+") |
151 ld = (l[0], l[1] + "+") |
153 if wctx == actx: # overwrite |
152 if wctx == actx: # overwrite |
216 '$$ &Changed $$ &Delete') % prompts, 0): |
215 '$$ &Changed $$ &Delete') % prompts, 0): |
217 debug(s, "prompt remove") |
216 debug(s, "prompt remove") |
218 wctx.sub(s).remove() |
217 wctx.sub(s).remove() |
219 |
218 |
220 for s, r in sorted(s2.items()): |
219 for s, r in sorted(s2.items()): |
221 prompts = None |
|
222 if s in s1: |
220 if s in s1: |
223 continue |
221 continue |
224 elif s not in sa: |
222 elif s not in sa: |
225 debug(s, "remote added, get", r) |
223 debug(s, "remote added, get", r) |
226 mctx.sub(s).get(r) |
224 mctx.sub(s).get(r) |