Intland's free requirements, development and test management hosting.
This server hosts 110,000+ users on the cloud!
Login Projects Wiki Documents Trackers Reports SCM Repositories Baselines
730
 Merge using Eclipse diff tool does not perform any automatic merging on simple conflicts.#13599/v7
more
Tags:  not added yet

Merge using Eclipse diff tool does not perform any automatic merging on simple conflicts.[CRQ-13599]

Tracker: Change Requests Priority: NormalNormal Status: Resolved
Submitted by: juniorhamish Jan 13, 2011 11:30 Modified by: johnpeb Mar 27, 2012 01:39 Assigned to: johnpeb Mar 27, 2012 01:39
Category: Merge Severity: -- Resolution: Fixed
Release: -- Detected: --
Relations
Loading...
Description
I have just started evaluating Mercurial for use within our company and I was playing with MercurialEclipse. When performing a merge the default behaviour of using Eclipse as the diff tool (i.e. 'Use external merge tool for resolving conflicts' is unticked) includes specifying the switch '--config ui.merge=internal:fail' in the merge command. This means that no attempt is made to automatically resolve the simple conflicts. In order to get this automatic merge you have to tell it to 'Use external merge tool for resolving conflicts'. But the drawback of this is that you don't get to use the Eclipse diff tool for resolving harder conflicts.

Would it not be possible to achieve a middle ground, whereby the automatic merge is attempted on simple conflicts, but still the Eclipse diff tool is used for the rest?

Details
Comments & Attachments (9)
Associations (0)
Children (0)
References (0)
SCM Commits (0)
All (0)

Author Comment
Nothing found to display.