##// END OF EJS Templates
filemerge: don't attempt to premerge change/delete conflicts...
Siddharth Agarwal -
r27041:0e330f59 default
parent child Browse files
Show More
@@ -287,9 +287,9 b' def _ifail(repo, mynode, orig, fcd, fco,'
287 used to resolve these conflicts."""
287 used to resolve these conflicts."""
288 return 1, False
288 return 1, False
289
289
290 def _premerge(repo, toolconf, files, labels=None):
290 def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None):
291 tool, toolpath, binary, symlink = toolconf
291 tool, toolpath, binary, symlink = toolconf
292 if symlink:
292 if symlink or fcd.isabsent() or fco.isabsent():
293 return 1
293 return 1
294 a, b, c, back = files
294 a, b, c, back = files
295
295
@@ -610,7 +610,7 b' def _filemerge(premerge, repo, mynode, o'
610 labels = _formatlabels(repo, fcd, fco, fca, labels)
610 labels = _formatlabels(repo, fcd, fco, fca, labels)
611
611
612 if premerge and mergetype == fullmerge:
612 if premerge and mergetype == fullmerge:
613 r = _premerge(repo, toolconf, files, labels=labels)
613 r = _premerge(repo, fcd, fco, fca, toolconf, files, labels=labels)
614 # complete if premerge successful (r is 0)
614 # complete if premerge successful (r is 0)
615 return not r, r, False
615 return not r, r, False
616
616
General Comments 0
You need to be logged in to leave comments. Login now