equal
deleted
inserted
replaced
146 if mode != m1.execf(f): |
146 if mode != m1.execf(f): |
147 ui.debug(_(" updating permissions for %s\n") % f) |
147 ui.debug(_(" updating permissions for %s\n") % f) |
148 action.append((f, "e", m2.execf(f))) |
148 action.append((f, "e", m2.execf(f))) |
149 del m2[f] |
149 del m2[f] |
150 elif f in ma: |
150 elif f in ma: |
151 if n != ma[f]: |
151 if n != ma[f] and not overwrite: |
152 r = _("d") |
152 r = ui.prompt( |
153 if not overwrite: |
153 (_(" local changed %s which remote deleted\n") % f) + |
154 r = ui.prompt( |
154 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) |
155 (_(" local changed %s which remote deleted\n") % f) + |
|
156 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) |
|
157 if r == _("d"): |
155 if r == _("d"): |
158 action.append((f, "r")) |
156 action.append((f, "r")) |
159 else: |
157 else: |
160 ui.debug(_("other deleted %s\n") % f) |
158 ui.debug(_("other deleted %s\n") % f) |
161 action.append((f, "r")) |
159 action.append((f, "r")) |