Merge patterns are ignored
Created originally on Bitbucket by michaelb_canstar (Michael Blaszczyk)
I've set up a couple of merge-patterns in my hgrc file but they do not work when trying to merge via the tortoiseHG GUI.
Upon inspecting the command executed when merging with 'Auto-resolve merges' set to True/Unspecified:
hg merge --verbose --tool=internal:merge 605
or when 'Auto-resolve merges' is set to False:
hg merge --verbose --tool=internal:fail 605
The --tool
flag is what is causing the merge patterns to be ignored.
Removing the flag from the command and manually executing it via the tortoiseHg console results in the merge pattern rules being adhered to.
There's multiple caveats to running the command manually:
- Having to actually type the command instead of using the GUI provided by tortoiseHg
- The 'resolve conflicts' screen does not appear
- As a result of 2 - the default merge tool (in my case kdiff3) opens for each file during the merge without allowing me to choose the order to resolve them