equal
deleted
inserted
replaced
1392 if r == "k": get[f] = n |
1392 if r == "k": get[f] = n |
1393 elif f not in ma: |
1393 elif f not in ma: |
1394 self.ui.debug("remote created %s\n" % f) |
1394 self.ui.debug("remote created %s\n" % f) |
1395 get[f] = n |
1395 get[f] = n |
1396 else: |
1396 else: |
1397 self.ui.debug("local deleted %s\n" % f) |
1397 if force or p2 == pa: # going backwards? |
1398 if force: |
1398 self.ui.debug("local deleted %s, recreating\n" % f) |
1399 get[f] = n |
1399 get[f] = n |
|
1400 else: |
|
1401 self.ui.debug("local deleted %s\n" % f) |
1400 |
1402 |
1401 del mw, m1, m2, ma |
1403 del mw, m1, m2, ma |
1402 |
1404 |
1403 if force: |
1405 if force: |
1404 for f in merge: |
1406 for f in merge: |