equal
deleted
inserted
replaced
142 'use (c)hanged version or (d)elete?') % s, |
142 'use (c)hanged version or (d)elete?') % s, |
143 (_('&Changed'), _('&Delete')), 0): |
143 (_('&Changed'), _('&Delete')), 0): |
144 debug(s, "prompt remove") |
144 debug(s, "prompt remove") |
145 wctx.sub(s).remove() |
145 wctx.sub(s).remove() |
146 |
146 |
147 for s, r in s2.items(): |
147 for s, r in sorted(s2.items()): |
148 if s in s1: |
148 if s in s1: |
149 continue |
149 continue |
150 elif s not in sa: |
150 elif s not in sa: |
151 debug(s, "remote added, get", r) |
151 debug(s, "remote added, get", r) |
152 mctx.sub(s).get(r) |
152 mctx.sub(s).get(r) |