equal
deleted
inserted
replaced
1097 merged.append(f) |
1097 merged.append(f) |
1098 else: |
1098 else: |
1099 removed.append(f) |
1099 removed.append(f) |
1100 with repo.dirstate.parentchange(): |
1100 with repo.dirstate.parentchange(): |
1101 for f in removed: |
1101 for f in removed: |
1102 repo.dirstate.remove(f) |
1102 repo.dirstate.update_file_p1(f, p1_tracked=True) |
1103 for f in merged: |
1103 for f in merged: |
1104 repo.dirstate.merge(f) |
1104 repo.dirstate.merge(f) |
1105 p1 = repo.dirstate.p1() |
1105 p1 = repo.dirstate.p1() |
1106 repo.setparents(p1, merge) |
1106 repo.setparents(p1, merge) |
1107 |
1107 |
2036 repo.dirstate.add(dst) |
2036 repo.dirstate.add(dst) |
2037 # Drop useless copy information |
2037 # Drop useless copy information |
2038 for f in list(repo.dirstate.copies()): |
2038 for f in list(repo.dirstate.copies()): |
2039 repo.dirstate.copy(None, f) |
2039 repo.dirstate.copy(None, f) |
2040 for f in r: |
2040 for f in r: |
2041 repo.dirstate.remove(f) |
2041 repo.dirstate.update_file_p1(f, p1_tracked=True) |
2042 # if the patch excludes a modified file, mark that |
2042 # if the patch excludes a modified file, mark that |
2043 # file with mtime=0 so status can see it. |
2043 # file with mtime=0 so status can see it. |
2044 mm = [] |
2044 mm = [] |
2045 for i in pycompat.xrange(len(m) - 1, -1, -1): |
2045 for i in pycompat.xrange(len(m) - 1, -1, -1): |
2046 if not match1(m[i]): |
2046 if not match1(m[i]): |