diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py index 8bfef57373214a37fe2121f77414bf0bb88ba484_bWVyY3VyaWFsL2ZpbGVtZXJnZS5weQ==..7833b13b001f35a99bf63ac36d3b272e74b65384_bWVyY3VyaWFsL2ZpbGVtZXJnZS5weQ== 100644 --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -500,6 +500,12 @@ ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) + if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, + toolconf): + if onfailure: + ui.warn(onfailure % fd) + return 1 + a = repo.wjoin(fd) b = temp("base", fca) c = temp("other", fco) @@ -507,9 +513,9 @@ util.copyfile(a, back) files = (a, b, c, back) - r = 0 - if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, - toolconf): - r = 1 - needcheck = False + markerstyle = ui.config('ui', 'mergemarkers', 'basic') + if not labels: + labels = _defaultconflictlabels + if markerstyle != 'basic': + labels = _formatlabels(repo, fcd, fco, fca, labels) @@ -515,13 +521,6 @@ - if not r: # precheck passed - markerstyle = ui.config('ui', 'mergemarkers', 'basic') - if not labels: - labels = _defaultconflictlabels - if markerstyle != 'basic': - labels = _formatlabels(repo, fcd, fco, fca, labels) - - needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, - files, labels=labels) + needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, files, + labels=labels) if not needcheck: if r: