Show More
@@ -142,10 +142,9 b' def manifestmerge(ui, m1, m2, ma, overwr' | |||||
142 | del m2[f] |
|
142 | del m2[f] | |
143 | elif f in ma: |
|
143 | elif f in ma: | |
144 | if n != ma[f] and not overwrite: |
|
144 | if n != ma[f] and not overwrite: | |
145 |
|
|
145 | if ui.prompt( | |
146 | (_(" local changed %s which remote deleted\n") % f) + |
|
146 | (_(" local changed %s which remote deleted\n") % f) + | |
147 | _("(k)eep or (d)elete?"), _("[kd]"), _("k")) |
|
147 | _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("d"): | |
148 | if r == _("d"): |
|
|||
149 | action.append((f, "r")) |
|
148 | action.append((f, "r")) | |
150 | else: |
|
149 | else: | |
151 | ui.debug(_("other deleted %s\n") % f) |
|
150 | ui.debug(_("other deleted %s\n") % f) | |
@@ -170,10 +169,9 b' def manifestmerge(ui, m1, m2, ma, overwr' | |||||
170 | ui.debug(_("local deleted %s, recreating\n") % f) |
|
169 | ui.debug(_("local deleted %s, recreating\n") % f) | |
171 | action.append((f, "g", m2.execf(f), n)) |
|
170 | action.append((f, "g", m2.execf(f), n)) | |
172 | elif n != ma[f]: |
|
171 | elif n != ma[f]: | |
173 |
|
|
172 | if ui.prompt( | |
174 | (_("remote changed %s which local deleted\n") % f) + |
|
173 | (_("remote changed %s which local deleted\n") % f) + | |
175 | _("(k)eep or (d)elete?"), _("[kd]"), _("k")) |
|
174 | _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("k"): | |
176 | if r == _("k"): |
|
|||
177 | action.append((f, "g", m2.execf(f), n)) |
|
175 | action.append((f, "g", m2.execf(f), n)) | |
178 | else: |
|
176 | else: | |
179 | ui.debug(_("local deleted %s\n") % f) |
|
177 | ui.debug(_("local deleted %s\n") % f) |
General Comments 0
You need to be logged in to leave comments.
Login now