Show More
@@ -1090,18 +1090,9 b' class queue(object):' | |||||
1090 |
|
1090 | |||
1091 | if merge and files: |
|
1091 | if merge and files: | |
1092 | # Mark as removed/merged and update dirstate parent info |
|
1092 | # Mark as removed/merged and update dirstate parent info | |
1093 | removed = [] |
|
|||
1094 | merged = [] |
|
|||
1095 | for f in files: |
|
|||
1096 | if os.path.lexists(repo.wjoin(f)): |
|
|||
1097 | merged.append(f) |
|
|||
1098 | else: |
|
|||
1099 | removed.append(f) |
|
|||
1100 | with repo.dirstate.parentchange(): |
|
1093 | with repo.dirstate.parentchange(): | |
1101 |
for f in |
|
1094 | for f in files: | |
1102 | repo.dirstate.update_file_p1(f, p1_tracked=True) |
|
1095 | repo.dirstate.update_file_p1(f, p1_tracked=True) | |
1103 | for f in merged: |
|
|||
1104 | repo.dirstate.merge(f) |
|
|||
1105 | p1 = repo.dirstate.p1() |
|
1096 | p1 = repo.dirstate.p1() | |
1106 | repo.setparents(p1, merge) |
|
1097 | repo.setparents(p1, merge) | |
1107 |
|
1098 |
General Comments 0
You need to be logged in to leave comments.
Login now