Am Donnerstag, den 21.05.2009, 14:15 -0500 schrieb Steve Borho:
> On Thu, May 21, 2009 at 2:02 PM, Bruce Mahfood
> <bmahf-/e1597as9lqavxtiumw...@public.gmane.org> wrote:
> >
> > Thanks. I looked a man page for hgrc (http://linux.die.net/man/5/hgrc). I
> > assume that these commands can go into my personal mercurial.ini file, and
> > so I have come up with the following for my mercurial.ini file. My
> > original mercurial.ini is shown first. I ran a merge on my repository with
> > the only file changed being my .db file, and the result is shown at the
> > end. Not encouraging. It didn't seem to recognize my entry for the
> > dbMergeTool. Any ideas???
> >
> >
> > # my original mercurial.ini file:
> > --------------------------------------------------------------------------------------
> > [format]
> > usestore = False
> >
> > [extdiff]
> > cmd.kdiff3 =
> >
> > [merge-tools]
> > kdiff3.args = --L1 Parent --L2 Local --L3 Other $base $local $other -o
> > $output
> >
> > [extensions]
> > hgext.extdiff =
> >
> > [tortoisehg]
> > vdiff = C:\Program Files\TortoiseHg\kdiff3
> > --------------------------------------------------------------------------------------
> >
> > # attempt at changes to my mercurial.ini file.
> > --------------------------------------------------------------------------------------
> > [format]
> > usestore = False
> >
> > [extdiff]
> > cmd.kdiff3 =
> > cmd.dbMergeTool = C:\temp\myprog # tried this with and without the .exe
> > extension.
extdiff is for comparing, not for merging.
>
> [merge-patterns]
> **.db = dbMergeTool
>
> > [merge-tools]
> > **.db = dbMergeTool
Delete the line above.
>
> dbMergeTool.binary = True
Do not set binary to True. This means the tool can merge _all_ binary
files. When the tool was selected by pattern match, it is used even if
binary is false.
But you probably need the path:
dbMergeTool.executable = C:\temp\myprog.exe
>
> > kdiff3.args = --L1 Parent --L2 Local --L3 Other $base $local $other -o
> > $output
> >
> > [extensions]
> > hgext.extdiff =
> >
> > [tortoisehg]
> > vdiff = C:\Program Files\TortoiseHg\kdiff3
> > --------------------------------------------------------------------------------------
> >
> >
> > *** tool kdiff3 can't handle binary
> > *** tool tortoisemerge can't handle binary
> > *** tool winmergeu can't handle binary
> > 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
> > (branch merge, don't forget to commit)
> > [command completed successfully]
> >
> >
> >
> >
> > ----- Original Message ----
> > From: Steve Borho <steve-4xjcoxhdil3ytjvyw6y...@public.gmane.org>
> > To: Bruce Mahfood <bmahf-/e1597as9lqavxtiumw...@public.gmane.org>
> > Cc: tortoisehg-develop-5nwgofrqmnerv+lv9mx5uipxlwaov...@public.gmane.org
> > Sent: Thursday, May 21, 2009 1:06:34 PM
> > Subject: Re: [thg-dev] Hooking to merge binary files
> >
[snip]
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
