git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] mergetool--lib: add p4merge as a pre-configured mergetool option

From
Charles Bailey <charles@hashpling.org>
Date
Oct 29, 2009, 22:12 UTC
Message-ID
<20091029221234.GB32590@hashpling.org>
In-Reply-To
<d411cc4a0910281439v3388c243v42b3700f73744623@mail.gmail.com>
On Wed, Oct 28, 2009 at 02:39:32PM -0700, Scott Chacon wrote:
Show 10 quoted lines
> p4merge is now a built-in diff/merge tool.
> This adds p4merge to git-completion and updates
> the documentation to mention p4merge.
> 
> Signed-Off-By: Scott Chacon <schacon@gmail.com>
> ---
> 
> This is the same patch, but I tested it on Linux as well as Mac and it
> works fine as long as the [difftool|mergetool].p4merge.path configs
> are set or it's in your path.

I've examined the two patches and I feel more comfortable with Scott's, mainly due to it's simplicity.

I'm not sure I understand why only p4merge on Mac OS X is special, we don't seem to treat any other mergetool specially and we don't seem to need absolute paths anywhere else.

If it's a Mac OS X only thing, can we (and should we) avoid special treatment for p4merge on other platforms?

The only other question I have is what are the merits of using /dev/null as the base vs. a second copy of the local version in the baseless merge case? It's the only other difference between the two p4merge patches that I noticed.

Perhaps we could consider having both p4merge and launchp4merge as separate options?

-- 
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
Previous: Jay SoffianNext: Jay Soffian
Message 9 of 18 in “mergetool--lib: add p4merge as a pre-configured mergetool option”
  1. mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon, Oct 27, 2009
  2. Charles BaileyOct 27, 2009
  3. Junio C HamanoOct 28, 2009
  4. David AguilarOct 28, 2009
  5. Scott ChaconOct 28, 2009
  6. mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon, Oct 28, 2009
  7. Junio C HamanoOct 28, 2009
  8. Jay SoffianOct 29, 2009
  9. Charles BaileyOct 29, 2009
  10. Jay SoffianOct 30, 2009
  11. Markus HeidelbergOct 30, 2009
  12. Jay SoffianOct 30, 2009
  13. Markus HeidelbergOct 30, 2009
  14. Reece DunnOct 30, 2009
  15. Jay SoffianOct 30, 2009
  16. Markus HeidelbergOct 30, 2009
  17. Charles BaileyOct 30, 2009
  18. Junio C HamanoOct 30, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.