Show More
@@ -175,17 +175,15 b' def manifestmerge(ui, m1, m2, ma, overwr' | |||||
175 |
|
175 | |||
176 | for f, n in m2.iteritems(): |
|
176 | for f, n in m2.iteritems(): | |
177 | if f in ma: |
|
177 | if f in ma: | |
178 | if n != ma[f]: |
|
178 | if overwrite or backwards: | |
179 | r = _("k") |
|
179 | ui.debug(_("local deleted %s, recreating\n") % f) | |
180 | if not overwrite: |
|
180 | action.append((f, "g", m2.execf(f), n)) | |
181 | r = ui.prompt( |
|
181 | elif n != ma[f]: | |
182 | (_("remote changed %s which local deleted\n") % f) + |
|
182 | r = ui.prompt( | |
183 | _("(k)eep or (d)elete?"), _("[kd]"), _("k")) |
|
183 | (_("remote changed %s which local deleted\n") % f) + | |
|
184 | _("(k)eep or (d)elete?"), _("[kd]"), _("k")) | |||
184 | if r == _("k"): |
|
185 | if r == _("k"): | |
185 | action.append((f, "g", m2.execf(f), n)) |
|
186 | action.append((f, "g", m2.execf(f), n)) | |
186 | elif overwrite or backwards: |
|
|||
187 | ui.debug(_("local deleted %s, recreating\n") % f) |
|
|||
188 | action.append((f, "g", m2.execf(f), n)) |
|
|||
189 | else: |
|
187 | else: | |
190 | ui.debug(_("local deleted %s\n") % f) |
|
188 | ui.debug(_("local deleted %s\n") % f) | |
191 | else: |
|
189 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now