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 30, 2009, 17:44 UTC
Message-ID
<20091030174421.GA21486@hashpling.org>
In-Reply-To
<d411cc4a0910281439v3388c243v42b3700f73744623@mail.gmail.com>
On Wed, Oct 28, 2009 at 02:39:32PM -0700, Scott Chacon wrote:
Show 6 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>
> ---
Acked-by: Charles Bailey <charles@hashpling.org>

I'm aware that we haven't reached full agreement on the best way to make p4merge + git as Mac OS X friendly as possible, but Jay said that this patch is 'good enough' and I agree. If we go with this for now, we're not closing the door to further improvements.

I confirmed a (perhaps very minor) issue with the abspath approach, the parameters are used as the title of the pains in p4merge, so (IMHO) short paths look neater, especially if you've cd'ed down to a low level and don't have a 1920 pixel wide monitor. p4merge does truncate from the left so it's not a big thing.

The other thing which I confirmed is that p4merge on windows doesn't like /dev/null as an explicit parameter (it gets convered to nul: by msys, I believe, but it still doesn't like it).

p4merge does appear to do 'magic' when the base and left are the same parameter (not just the same file - the magic doesn't work if you, say, use a relative path and an absolute path to refer to the same file. This means that it doesn't just take the right changes which is what I feared it might do when I first saw the 'local' 'local' 'remote' pattern.

Charles.
-- 
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
Previous: Markus HeidelbergNext: Junio C Hamano
Message 17 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.