On 28-07-2011 11:15, Mads Kiilerich wrote: > On 07/28/2011 04:05 AM, André Felipe Dias wrote: >> Hi, >> >> TortoiseHg installation fills the configuration with lots of merge tools >> settings and this is good. The problem is that each tool has its >> premerge value set to False and it is not the expected default behavior >> according to Mercurial specification >> (http://www.selenic.com/mercurial/hgrc.5.html#merge-tools). I'd like to >> suggest that the TortoiseHg installation does not set premerge at all in >> next releases. > > Why? What problem do you see? A default is just a default, and it is > not a bug to have configuration that set it to something else. I am > sure someone put the values there for a reason - in what were they wrong? > > premerge set to True (which is the default in Mercurial if nothing > else is set) means that Mercurial automatically and silently will > combine edits in different parts of the file without using the merge > tool. That is convenient if you have a not-so-powerful merge tool > (such as a plain text editor), but it will in some (pathological) > cases silently make an incorrect merge without starting the merge tool > where the user could review and acknowledge the merge. (In my opinion > the default value in Mercurial should be 100% safe and have premerge > off, but that's a different and old story.) > > However, with a good merge tool there is no reason why you shouldn't > leave all file merges to the merge tool where they can reviewed, > rather than letting some of them be resolved silently. Especially for > kdiff3 there are some cases where it could be argued that it do a > better job than Mercurial - especially because it can interact with > the user. > > /Mads >
I had a classroom full of students who didn't expect this behavior. If a merge launches an external tool, it seems that there is a problem to be solved. Common and simple merge cases are expected to be resolved by Mercurial. I've ran into a case where kdiff3 results were slightly different from others tools. I can't recall exactly what situation was that now, but it didn't worth the trouble. I'd appreciate if you present one pathological case. After all, Mercurial's internal merge is reliable to deal with plain text or not? André ------------------------------------------------------------------------------ Got Input? Slashdot Needs You. Take our quick survey online. Come on, we don't ask for help often. Plus, you'll get a chance to win $100 to spend on ThinkGeek. http://p.sf.net/sfu/slashdot-survey _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
