Show More
@@ -115,10 +115,6 b' def _prepare_files(tr, ctx, error=False,' | |||
|
115 | 115 | |
|
116 | 116 | writechangesetcopy, writefilecopymeta = _write_copy_meta(repo) |
|
117 | 117 | |
|
118 | p1copies, p2copies = None, None | |
|
119 | if writechangesetcopy: | |
|
120 | p1copies = ctx.p1copies() | |
|
121 | p2copies = ctx.p2copies() | |
|
122 | 118 | filesadded, filesremoved = None, None |
|
123 | 119 | if ctx.manifestnode(): |
|
124 | 120 | # reuse an existing manifest revision |
@@ -144,10 +140,9 b' def _prepare_files(tr, ctx, error=False,' | |||
|
144 | 140 | files = metadata.ChangingFiles() |
|
145 | 141 | if touched: |
|
146 | 142 | files.update_touched(touched) |
|
147 | if p1copies: | |
|
148 | files.update_copies_from_p1(p1copies) | |
|
149 | if p2copies: | |
|
150 | files.update_copies_from_p2(p2copies) | |
|
143 | if writechangesetcopy: | |
|
144 | files.update_copies_from_p1(ctx.p1copies()) | |
|
145 | files.update_copies_from_p2(ctx.p2copies()) | |
|
151 | 146 | if filesadded: |
|
152 | 147 | files.update_added(filesadded) |
|
153 | 148 | if filesremoved: |
General Comments 0
You need to be logged in to leave comments.
Login now