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 in ma and n != ma[f]: |
177 if f in ma: |
178 r = _("k") |
178 if n != ma[f]: |
179 if not overwrite: |
179 r = _("k") |
180 r = ui.prompt( |
180 if not overwrite: |
181 (_("remote changed %s which local deleted\n") % f) + |
181 r = ui.prompt( |
182 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) |
182 (_("remote changed %s which local deleted\n") % f) + |
183 if r == _("k"): |
183 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) |
|
184 if r == _("k"): |
|
185 action.append((f, "g", m2.execf(f), n)) |
|
186 elif overwrite or backwards: |
|
187 ui.debug(_("local deleted %s, recreating\n") % f) |
184 action.append((f, "g", m2.execf(f), n)) |
188 action.append((f, "g", m2.execf(f), n)) |
185 elif f not in ma: |
189 else: |
|
190 ui.debug(_("local deleted %s\n") % f) |
|
191 else: |
186 ui.debug(_("remote created %s\n") % f) |
192 ui.debug(_("remote created %s\n") % f) |
187 action.append((f, "g", m2.execf(f), n)) |
193 action.append((f, "g", m2.execf(f), n)) |
188 else: |
|
189 if overwrite or backwards: |
|
190 ui.debug(_("local deleted %s, recreating\n") % f) |
|
191 action.append((f, "g", m2.execf(f), n)) |
|
192 else: |
|
193 ui.debug(_("local deleted %s\n") % f) |
|
194 |
194 |
195 return action |
195 return action |
196 |
196 |
197 def applyupdates(repo, action, xp1, xp2): |
197 def applyupdates(repo, action, xp1, xp2): |
198 updated, merged, removed, unresolved = 0, 0, 0, 0 |
198 updated, merged, removed, unresolved = 0, 0, 0, 0 |