Please review: 6740762 hgsetup should configure filemerge.premerge = false
webrev: http://cr.opensolaris.org/~richlowe/onnv_6740762 Evaluation: Matching Description, we should default to preventing Hg's automerge (though for all 3 tools, rather than just filemerge) filemerge, and gpyfm have the ability to auto-merge in the GUI, for those who want to. (most people internally would be using filemerge, I mention gpyfm only in passing). Meld does not have that ability (that I can currently find in the GUI) It is better for us to prevent blind auto-merge, even in the case where it results in the using having to merge obvious things by hand (that is in fact, the preferably case), in the cause of avoiding silent mis-merge. Testing: Created a simple two-headed workspace with changes in each head that will require a merge, but could be successfully automerge. Using the created hgrc, merged using each of the tools, was made to do the merge myself. Set premerge to True in that hgrc, verified that in that case (the default) Mercurial would automerge, and thus that the setting we were entering prevented that. pbchk: pbchk -q is silent. If this change is seen as requiring a heads-up be sent to on-discuss (I don't know), its contents should approximate: As of my putback of 6740762 the ~/.hgrc created by hgsetup(1) will configure Mercurial to not auto-merge conflicting changes, and instead require resolution in the normal fashion. If you wish to restore the prior behaviour (which I somewhat discourage), you should either remove the .premerge settings in the [merge-tools] section of your hgrc to set their values to True, or remove the lines entirely (True is the default) If you have an existing hgrc but wish to prevent auto-merge, you should set .premerge=False in that section for each tool (you can use the hgrc created by hgsetup(1) as an example). Thanks, -- Rich
