equal
deleted
inserted
replaced
1106 remove.append(f) |
1106 remove.append(f) |
1107 else: |
1107 else: |
1108 self.ui.debug("other deleted %s\n" % f) |
1108 self.ui.debug("other deleted %s\n" % f) |
1109 remove.append(f) # other deleted it |
1109 remove.append(f) # other deleted it |
1110 else: |
1110 else: |
1111 if n == m1.get(f, nullid): # same as parent |
1111 # file is created on branch or in working directory |
|
1112 if force and f not in umap: |
|
1113 self.ui.debug("remote deleted %s, clobbering\n" % f) |
|
1114 remove.append(f) |
|
1115 elif n == m1.get(f, nullid): # same as parent |
1112 if p2 == pa: # going backwards? |
1116 if p2 == pa: # going backwards? |
1113 self.ui.debug("remote deleted %s\n" % f) |
1117 self.ui.debug("remote deleted %s\n" % f) |
1114 remove.append(f) |
1118 remove.append(f) |
1115 else: |
1119 else: |
1116 self.ui.debug("local created %s, keeping\n" % f) |
1120 self.ui.debug("local modified %s, keeping\n" % f) |
1117 else: |
1121 else: |
1118 self.ui.debug("working dir created %s, keeping\n" % f) |
1122 self.ui.debug("working dir created %s, keeping\n" % f) |
1119 |
1123 |
1120 for f, n in m2.iteritems(): |
1124 for f, n in m2.iteritems(): |
1121 if choose and not choose(f): continue |
1125 if choose and not choose(f): continue |