equal
deleted
inserted
replaced
1022 else: |
1022 else: |
1023 self.ui.debug("other deleted %s\n" % f) |
1023 self.ui.debug("other deleted %s\n" % f) |
1024 remove.append(f) # other deleted it |
1024 remove.append(f) # other deleted it |
1025 else: |
1025 else: |
1026 if n == m1.get(f, nullid): # same as parent |
1026 if n == m1.get(f, nullid): # same as parent |
1027 self.ui.debug("remote deleted %s\n" % f) |
1027 self.ui.debug("local created %s, keeping\n" % f) |
1028 remove.append(f) |
|
1029 else: |
1028 else: |
1030 self.ui.debug("working dir created %s, keeping\n" % f) |
1029 self.ui.debug("working dir created %s, keeping\n" % f) |
1031 |
1030 |
1032 for f, n in m2.iteritems(): |
1031 for f, n in m2.iteritems(): |
1033 if f[0] == "/": continue |
1032 if f[0] == "/": continue |