equal
deleted
inserted
replaced
1261 linear_path = (pa == p1 or pa == p2) |
1261 linear_path = (pa == p1 or pa == p2) |
1262 |
1262 |
1263 # resolve the manifest to determine which files |
1263 # resolve the manifest to determine which files |
1264 # we care about merging |
1264 # we care about merging |
1265 self.ui.note("resolving manifests\n") |
1265 self.ui.note("resolving manifests\n") |
|
1266 self.ui.debug(" force %s allow %s moddirstate %s linear %s\n" % |
|
1267 (force, allow, moddirstate, linear_path)) |
1266 self.ui.debug(" ancestor %s local %s remote %s\n" % |
1268 self.ui.debug(" ancestor %s local %s remote %s\n" % |
1267 (short(man), short(m1n), short(m2n))) |
1269 (short(man), short(m1n), short(m2n))) |
1268 |
1270 |
1269 merge = {} |
1271 merge = {} |
1270 get = {} |
1272 get = {} |
1378 elif f not in ma: |
1380 elif f not in ma: |
1379 self.ui.debug("remote created %s\n" % f) |
1381 self.ui.debug("remote created %s\n" % f) |
1380 get[f] = n |
1382 get[f] = n |
1381 else: |
1383 else: |
1382 self.ui.debug("local deleted %s\n" % f) |
1384 self.ui.debug("local deleted %s\n" % f) |
|
1385 if force: |
|
1386 get[f] = n |
1383 |
1387 |
1384 del mw, m1, m2, ma |
1388 del mw, m1, m2, ma |
1385 |
1389 |
1386 if force: |
1390 if force: |
1387 for f in merge: |
1391 for f in merge: |