Skip to content
Snippets Groups Projects
Commit 1bde66b8 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

filemerge._mergecheck: add check for change/delete conflicts

Merge tools that perform an actual 3-way merge can't handle change/delete
conflicts. This adds a check for that.
parent d7517dee
No related branches found
No related tags found
No related merge requests found
...@@ -328,6 +328,10 @@ ...@@ -328,6 +328,10 @@
repo.ui.warn(_('warning: internal %s cannot merge symlinks ' repo.ui.warn(_('warning: internal %s cannot merge symlinks '
'for %s\n') % (tool, fcd.path())) 'for %s\n') % (tool, fcd.path()))
return False return False
if fcd.isabsent() or fco.isabsent():
repo.ui.warn(_('warning: internal %s cannot merge change/delete '
'conflict for %s\n') % (tool, fcd.path()))
return False
return True return True
def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode): def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment