equal
deleted
inserted
replaced
1074 else: |
1074 else: |
1075 self.ui.debug("other deleted %s\n" % f) |
1075 self.ui.debug("other deleted %s\n" % f) |
1076 remove.append(f) # other deleted it |
1076 remove.append(f) # other deleted it |
1077 else: |
1077 else: |
1078 if n == m1.get(f, nullid): # same as parent |
1078 if n == m1.get(f, nullid): # same as parent |
1079 self.ui.debug("local created %s, keeping\n" % f) |
1079 if p2 == pa: # going backwards? |
|
1080 self.ui.debug("remote deleted %s\n" % f) |
|
1081 remove.append(f) |
|
1082 else: |
|
1083 self.ui.debug("local created %s, keeping\n" % f) |
1080 else: |
1084 else: |
1081 self.ui.debug("working dir created %s, keeping\n" % f) |
1085 self.ui.debug("working dir created %s, keeping\n" % f) |
1082 |
1086 |
1083 for f, n in m2.iteritems(): |
1087 for f, n in m2.iteritems(): |
1084 if f[0] == "/": continue |
1088 if f[0] == "/": continue |