Show More
@@ -2293,8 +2293,8 b' class localrepository(object):' | |||
|
2293 | 2293 | |
|
2294 | 2294 | flog = self.file(fname) |
|
2295 | 2295 | meta = {} |
|
2296 |
c |
|
|
2297 |
if c |
|
|
2296 | cfname = fctx.copysource() | |
|
2297 | if cfname and cfname != fname: | |
|
2298 | 2298 | # Mark the new revision of this file as a copy of another |
|
2299 | 2299 | # file. This copy data will effectively act as a parent |
|
2300 | 2300 | # of this new revision. If this is a merge, the first |
@@ -2314,7 +2314,6 b' class localrepository(object):' | |||
|
2314 | 2314 | # \- 2 --- 4 as the merge base |
|
2315 | 2315 | # |
|
2316 | 2316 | |
|
2317 | cfname = copy[0] | |
|
2318 | 2317 | crev = manifest1.get(cfname) |
|
2319 | 2318 | newfparent = fparent2 |
|
2320 | 2319 |
General Comments 0
You need to be logged in to leave comments.
Login now