On 28-07-2011 02:25, Steve Borho wrote: > 2011/7/27 André Felipe Dias<[email protected]>: >> 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. > I tend to agree with you just based on how our resolve tool works, but > I didn't find any basis for the statement that the expected default is > False. Mercurial's own mergetools.rc file has many of them set to > true, and the manpage says the default is true. >
You're right. I realized that there are Mercurial's configurations in Linux that also set premerge to false. I don't know what exactly "on how our resolve tool works" means, but I guess that the best workflow is let Mercurial try to solve basic merge first and launch an external merge tool only if there are conflicts. Should I submit this issue to the Mercurial mailing list? -- André Felipe Dias ------------------------------------------------------------------------------ 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
