Show More
@@ -2342,13 +2342,13 b' class localrepository(object):' | |||||
2342 | # \- 2 --- 4 as the merge base |
|
2342 | # \- 2 --- 4 as the merge base | |
2343 | # |
|
2343 | # | |
2344 |
|
2344 | |||
2345 |
c |
|
2345 | cnode = manifest1.get(cfname) | |
2346 | newfparent = fparent2 |
|
2346 | newfparent = fparent2 | |
2347 |
|
2347 | |||
2348 | if manifest2: # branch merge |
|
2348 | if manifest2: # branch merge | |
2349 |
if fparent2 == nullid or c |
|
2349 | if fparent2 == nullid or cnode is None: # copied on remote side | |
2350 | if cfname in manifest2: |
|
2350 | if cfname in manifest2: | |
2351 |
c |
|
2351 | cnode = manifest2[cfname] | |
2352 | newfparent = fparent1 |
|
2352 | newfparent = fparent1 | |
2353 |
|
2353 | |||
2354 | # Here, we used to search backwards through history to try to find |
|
2354 | # Here, we used to search backwards through history to try to find | |
@@ -2360,10 +2360,10 b' class localrepository(object):' | |||||
2360 | # expect this outcome it can be fixed, but this is the correct |
|
2360 | # expect this outcome it can be fixed, but this is the correct | |
2361 | # behavior in this circumstance. |
|
2361 | # behavior in this circumstance. | |
2362 |
|
2362 | |||
2363 |
if c |
|
2363 | if cnode: | |
2364 |
self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(c |
|
2364 | self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(cnode))) | |
2365 | meta["copy"] = cfname |
|
2365 | meta["copy"] = cfname | |
2366 |
meta["copyrev"] = hex(c |
|
2366 | meta["copyrev"] = hex(cnode) | |
2367 | fparent1, fparent2 = nullid, newfparent |
|
2367 | fparent1, fparent2 = nullid, newfparent | |
2368 | else: |
|
2368 | else: | |
2369 | self.ui.warn(_("warning: can't find ancestor for '%s' " |
|
2369 | self.ui.warn(_("warning: can't find ancestor for '%s' " |
General Comments 0
You need to be logged in to leave comments.
Login now