equal
deleted
inserted
replaced
1177 self.ui.debug(" updating permissions for %s\n" % f) |
1177 self.ui.debug(" updating permissions for %s\n" % f) |
1178 util.set_exec(self.wjoin(f), mode) |
1178 util.set_exec(self.wjoin(f), mode) |
1179 mark[f] = 1 |
1179 mark[f] = 1 |
1180 del m2[f] |
1180 del m2[f] |
1181 elif f in ma: |
1181 elif f in ma: |
1182 if not force and n != ma[f]: |
1182 if n != ma[f]: |
1183 r = "" |
1183 r = "d" |
1184 if linear_path or allow: |
1184 if not force and (linear_path or allow): |
1185 r = self.ui.prompt( |
1185 r = self.ui.prompt( |
1186 (" local changed %s which remote deleted\n" % f) + |
1186 (" local changed %s which remote deleted\n" % f) + |
1187 "(k)eep or (d)elete?", "[kd]", "k") |
1187 "(k)eep or (d)elete?", "[kd]", "k") |
1188 if r == "d": |
1188 if r == "d": |
1189 remove.append(f) |
1189 remove.append(f) |
1201 self.ui.debug("working dir created %s, keeping\n" % f) |
1201 self.ui.debug("working dir created %s, keeping\n" % f) |
1202 |
1202 |
1203 for f, n in m2.iteritems(): |
1203 for f, n in m2.iteritems(): |
1204 if choose and not choose(f): continue |
1204 if choose and not choose(f): continue |
1205 if f[0] == "/": continue |
1205 if f[0] == "/": continue |
1206 if not force and f in ma and n != ma[f]: |
1206 if f in ma and n != ma[f]: |
1207 r = "" |
1207 r = "k" |
1208 if linear_path or allow: |
1208 if not force and (linear_path or allow): |
1209 r = self.ui.prompt( |
1209 r = self.ui.prompt( |
1210 ("remote changed %s which local deleted\n" % f) + |
1210 ("remote changed %s which local deleted\n" % f) + |
1211 "(k)eep or (d)elete?", "[kd]", "k") |
1211 "(k)eep or (d)elete?", "[kd]", "k") |
1212 if r == "d": remove.append(f) |
1212 if r == "k": get[f] = n |
1213 else: |
1213 elif f not in ma: |
1214 self.ui.debug("remote created %s\n" % f) |
1214 self.ui.debug("remote created %s\n" % f) |
1215 get[f] = n |
1215 get[f] = n |
|
1216 else: |
|
1217 self.ui.debug("local deleted %s\n" % f) |
1216 |
1218 |
1217 del mw, m1, m2, ma |
1219 del mw, m1, m2, ma |
1218 |
1220 |
1219 if force: |
1221 if force: |
1220 for f in merge: |
1222 for f in merge: |