On Fri, 11 Dec 2015 09:35:55 +0000, FLORENT Philippe <philippe.flor...@edenred.com> wrote: > No need to go wild here, I never said anything about « DELIBERATELY NOT USING > YOUR VERSION CONTROL” > We still do commits and push, I said so far we don’t have time to f@#k around > with kdiff merges so I copy paste things manualy > I’ll try with winmerge this time
Consider using the following settings for WinMerge to use when you use it with Mercurial: $ hg config | ag winmerge merge-tools.winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output merge-tools.winmerge.regkey=Software\Thingamahoochie\WinMerge merge-tools.winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\ merge-tools.winmerge.regname=Executable merge-tools.winmerge.check=changed merge-tools.winmerge.gui=True merge-tools.winmerge.priority=-10 merge-tools.winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child Those are the default settings for WinMerge available from a file called `mergetools.rc`. If you run `hg config`, there are default settings for other diff/merging tools as well. More information can be found in https://www.mercurial-scm.org/wiki/MergeToolConfiguration If you already have these settings or something similar, please disregard my email. I use Beyond Compare myself, and I have the following settings in my Hg config file: [ui] merge = bcomp [merge-tools] bcomp.executable = path/to/bcompare.exe bcomp.args = $local $other $base $output bcomp.priority = 1 bcomp.premerge = True bcomp.gui = True This forces Beyond Compare to pop up whenever I have merge conflicts. Hopefully these help you perform merges easier. > I am not the only one complaining about kdiff > > From: Benjamin Fritz [mailto:fritzophre...@gmail.com] > Sent: jeudi 10 décembre 2015 14:01 > To: FLORENT Philippe > Cc: tortoisehg-discuss@lists.sourceforge.net > Subject: Re: [thg] FW: FW: alternative to tortoise merge tool > > > > On Thu, Dec 10, 2015 at 4:17 AM, FLORENT Philippe > <philippe.flor...@edenred.com<mailto:philippe.flor...@edenred.com>> wrote: > > > > Now, some functions are even missing, it is so hard to have a clear view of > > what’s going on > > > > > > > > I am in a prod environment with deadlines, so we send modifs by mail > > > > > > Wait, so you're DELIBERATELY NOT USING YOUR VERSION CONTROL to do your > merges, and then complaining that your version control doesn't realize you > already did a merge? > > Sorry to be blunt but you're doing it wrong. > > > > > > Shame to come to this, but kdiff is … well I rather not be vulgar > > > > > > You've given kdiff bad input. "Garbage in, garbage out," as they say. > Mercurial, and thus kdiff, has no way to know what has already been merged. > You'll find life is much easier if you use your tools the way they're > designed to be used. > > For instance, you (or a team member) probably had a merge conflict for > defining the same function in two different branches. For some reason the > person doing that merge chose both sides of the conflict, and saved, even > though it is clearly displayed in the merge result area that this has > happened. > > Either that, or you added the same function in two different places, so that > kdiff saw independent changes on two branches and automatically selected > both. This could be solved by doing proper merges in Mercurial rather than > applying patches willy-nilly. > > > > > Adding to this that sometimes, a head cannot be pushed anymore, some of us > > suddenly get some errors doing so (255 aborted in tortoise) > > > > > > > The actual error message could help figure out what's going on. Is it just > that you're trying to push a new head? Simply merge before pushing to fix > that. > > Or, shoot yourself in the foot even further and force the push. But you > probably don't want to do that. > > > > > So we use something like phil3 instead of phil2 (after recloning the > > central rep) and we’re back on tracks > > > > > > You're using what, now? Searching for both of these just gives me Bible > references, no software tools. > > > > > Pfff takes ages to get along with a versioning system > > > > > > > Sounds like you and your team need to read a tutorial or "getting started" > guide to start using Mercurial effectively instead of just diving in and > doing everything wrong. ---- Thanks, Arnel ------------------------------------------------------------------------------ _______________________________________________ Tortoisehg-discuss mailing list Tortoisehg-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
