Show More
@@ -493,6 +493,13 b' def filemerge(repo, mynode, orig, fcd, f' | |||||
493 | if mergetype == nomerge: |
|
493 | if mergetype == nomerge: | |
494 | return func(repo, mynode, orig, fcd, fco, fca, toolconf) |
|
494 | return func(repo, mynode, orig, fcd, fco, fca, toolconf) | |
495 |
|
495 | |||
|
496 | if orig != fco.path(): | |||
|
497 | ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) | |||
|
498 | else: | |||
|
499 | ui.status(_("merging %s\n") % fd) | |||
|
500 | ||||
|
501 | ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) | |||
|
502 | ||||
496 | a = repo.wjoin(fd) |
|
503 | a = repo.wjoin(fd) | |
497 | b = temp("base", fca) |
|
504 | b = temp("base", fca) | |
498 | c = temp("other", fco) |
|
505 | c = temp("other", fco) | |
@@ -500,13 +507,6 b' def filemerge(repo, mynode, orig, fcd, f' | |||||
500 | util.copyfile(a, back) |
|
507 | util.copyfile(a, back) | |
501 | files = (a, b, c, back) |
|
508 | files = (a, b, c, back) | |
502 |
|
509 | |||
503 | if orig != fco.path(): |
|
|||
504 | ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) |
|
|||
505 | else: |
|
|||
506 | ui.status(_("merging %s\n") % fd) |
|
|||
507 |
|
||||
508 | ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) |
|
|||
509 |
|
||||
510 | r = 0 |
|
510 | r = 0 | |
511 | if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, |
|
511 | if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, | |
512 | toolconf): |
|
512 | toolconf): |
General Comments 0
You need to be logged in to leave comments.
Login now