equal
deleted
inserted
replaced
172 ui.debug(_("local modified %s, keeping\n") % f) |
172 ui.debug(_("local modified %s, keeping\n") % f) |
173 else: |
173 else: |
174 ui.debug(_("working dir created %s, keeping\n") % f) |
174 ui.debug(_("working dir created %s, keeping\n") % f) |
175 |
175 |
176 for f, n in m2.iteritems(): |
176 for f, n in m2.iteritems(): |
177 if f[0] == "/": |
|
178 continue |
|
179 if f in ma and n != ma[f]: |
177 if f in ma and n != ma[f]: |
180 r = _("k") |
178 r = _("k") |
181 if not overwrite: |
179 if not overwrite: |
182 r = ui.prompt( |
180 r = ui.prompt( |
183 (_("remote changed %s which local deleted\n") % f) + |
181 (_("remote changed %s which local deleted\n") % f) + |