Show More
@@ -1193,7 +1193,9 b' class queue:' | |||||
1193 | copies = {} |
|
1193 | copies = {} | |
1194 | for dst in a: |
|
1194 | for dst in a: | |
1195 | src = repo.dirstate.copied(dst) |
|
1195 | src = repo.dirstate.copied(dst) | |
1196 |
|
|
1196 | # during qfold, the source file for copies may | |
|
1197 | # be removed. Treat this as a simple add. | |||
|
1198 | if src is not None and src in repo.dirstate: | |||
1197 | copies.setdefault(src, []).append(dst) |
|
1199 | copies.setdefault(src, []).append(dst) | |
1198 | repo.dirstate.add(dst) |
|
1200 | repo.dirstate.add(dst) | |
1199 | # remember the copies between patchparent and tip |
|
1201 | # remember the copies between patchparent and tip |
General Comments 0
You need to be logged in to leave comments.
Login now