From: David Aguilar <davvid@gmail.com>
Date: Wed, 28 Oct 2009 09:27:19 GMT
Subject: Re: [PATCH] mergetool--lib: add support for p4merge
Message-ID: <20091028092718.GB90780@gmail.com>
In-Reply-To: <76718490910280221u4e1d3e78me7f9b0b45f590e56@mail.gmail.com>

On Wed, Oct 28, 2009 at 02:21:46AM -0700, Jay Soffian wrote:
> On Wed, Oct 28, 2009 at 2:11 AM, Jay Soffian <jaysoffian@gmail.com> wrote:
> > Add native support for p4merge as a diff / merge tool. There are two
> > oddities. First, launching p4merge on Mac OS X requires running a helper
> > shim (which in turn is looked for in a couple common locations, as it's
> > very unlikely to be in PATH). Second, p4merge seems to require its file
> > arguments be absolute paths.
> >
> > Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
> > ---
> 
> Amusing. I didn't see Scott's patch.

Apologies Jay!

It's late and I saw Scott listed in the CC: and guessed wrong ;)

Thanks for the patch again, man.  Good stuff.



> 
> But, in my testing, for things to work properly I needed to use
> launchp4merge per:
> 
> http://kb.perforce.com/AllPerforceApplications/StandAloneClients/P4merge/CommandLineP..rgeOnMacOsX
> 
> And I also found things didn't work properly unless I provided an absolute path.
> 
> (Aside, the "right" way to launch p4merge, at least on 10.6 would be:
> 
> /usr/bin/open -b com.perforce.p4merge -W -n --args <args to p4merge...>
> 
> This way OS X's launch services would find p4merge.app wherever it is
> on the user's system. But, I think some of these options to open are
> 10.6 specific and in practice looking in /Applications and
> $HOME/Applications I think is a sane enough default.)
> 
> j.

-- 
		David