From: David Aguilar <davvid@gmail.com>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: git@vger.kernel.org, "Shawn O . Pearce" <spearce@spearce.org>,
Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
Scott Chacon <schacon@gmail.com>
Subject: Re: [PATCH] mergetool--lib: add support for p4merge
Date: Wed, 28 Oct 2009 02:36:56 -0700 [thread overview]
Message-ID: <20091028093655.GC90780@gmail.com> (raw)
In-Reply-To: <76718490910280221u4e1d3e78me7f9b0b45f590e56@mail.gmail.com>
On Wed, Oct 28, 2009 at 02:21:46AM -0700, Jay Soffian wrote:
>
> 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...>
:(
I tested on 10.5, so there's definitely some difference in
behavior since difftool.p4merge.path is all that was needed here
(with an absolute path as I mentioned).
> 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.)
We've stayed away from hard-coding any platform-specific paths
in mergetool--lib in the past. It's a practicality thing --
trying to guess all of the possible installation locations is
simply untenable.
Here's an old thread where we talked about this in the context
of ecmerge:
http://thread.gmane.org/gmane.comp.version-control.git/118125/focus=118182
Let me know what you think.
--
David
next prev parent reply other threads:[~2009-10-28 9:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-28 9:11 [PATCH] mergetool--lib: add support for p4merge Jay Soffian
2009-10-28 9:21 ` Jay Soffian
2009-10-28 9:27 ` David Aguilar
2009-10-28 9:36 ` David Aguilar [this message]
2009-10-28 9:52 ` Jay Soffian
2009-10-28 10:02 ` Jay Soffian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091028093655.GC90780@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@gmail.com \
--cc=peff@peff.net \
--cc=schacon@gmail.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.