Show More
@@ -417,13 +417,10 b' def overridemanifestmerge(origfn, repo, ' | |||
|
417 | 417 | # Override filemerge to prompt the user about how they wish to merge |
|
418 | 418 | # largefiles. This will handle identical edits without prompting the user. |
|
419 | 419 | def overridefilemerge(origfn, repo, mynode, orig, fcd, fco, fca): |
|
420 | # Use better variable names here. Because this is a wrapper we cannot | |
|
421 | # change the variable names in the function declaration. | |
|
422 | fcdest, fcother, fcancestor = fcd, fco, fca | |
|
423 | 420 | if not lfutil.isstandin(orig): |
|
424 |
return origfn(repo, mynode, orig, fcd |
|
|
425 | else: | |
|
426 |
|
|
|
421 | return origfn(repo, mynode, orig, fcd, fco, fca) | |
|
422 | ||
|
423 | if not fco.cmp(fcd): # files identical? | |
|
427 | 424 |
|
|
428 | 425 | |
|
429 | 426 |
|
@@ -432,10 +429,8 b' def overridefilemerge(origfn, repo, myno' | |||
|
432 | 429 |
|
|
433 | 430 |
|
|
434 | 431 |
|
|
435 |
|
|
|
436 | return 0 | |
|
437 | else: | |
|
438 | repo.wwrite(fcdest.path(), fcother.data(), fcother.flags()) | |
|
432 | 0) == 1: | |
|
433 | repo.wwrite(fcd.path(), fco.data(), fco.flags()) | |
|
439 | 434 |
|
|
440 | 435 | |
|
441 | 436 | # Copy first changes the matchers to match standins instead of |
General Comments 0
You need to be logged in to leave comments.
Login now