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

Re: [PATCH 1/2] p4merge: swap LOCAL and REMOTE for mergetool

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 7, 2013, 20:31 UTC
Message-ID
<7v4ngnlznw.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAJDDKr5-ttcU48r0-qTfov7q736Rj63rS33fTScSsvx53VG4pA@mail.gmail.com>
David Aguilar <davvid@gmail.com> writes:
Show 19 quoted lines
> I would prefer to treat this as a bugfix rather than introducing
> a new set of configuration knobs if possible.  It really does
> seem like a correction.
> 
> Users that want the traditional behavior can get that by
> configuring a custom mergetool.p4merge.cmd, so we're not
> completely losing the ability to get at the old behavior.
>
> Users that want to see a reverse diff with difftool can
> already say "--reverse", so there's even less reason to
> have it there (though I know we're talking about mergetool only).
> ...
> I would much rather prefer to have the default/mainstream
> behavior be the best out-of-the-box sans configuration.
>
> The reasoning behind swapping them for p4merge makes sense
> for p4merge only.  I don't think we're quite ready to declare
> that all the merge tools need to be swapped or that we need a
> mechanism for swapping the order.
Thanks for an injection of sanity.
Previous: David AguilarNext: Kevin Bracey
Message 9 of 40 in “Improve P4Merge mergetool invocation”
  1. 0/2 Improve P4Merge mergetool invocationKevin Bracey, Mar 6, 2013
  2. 1/2 p4merge: swap LOCAL and REMOTE for mergetoolKevin Bracey, Mar 6, 2013
  3. Junio C HamanoMar 7, 2013
  4. Kevin BraceyMar 7, 2013
  5. Junio C HamanoMar 7, 2013
  6. Kevin BraceyMar 7, 2013
  7. Junio C HamanoMar 7, 2013
  8. David AguilarMar 7, 2013
  9. Junio C HamanoMar 7, 2013
  10. 2/2 p4merge: create a virtual base if none availableKevin Bracey, Mar 6, 2013
  11. David AguilarMar 7, 2013
  12. Kevin BraceyMar 7, 2013
  13. Junio C HamanoMar 7, 2013
  14. David AguilarMar 7, 2013
  15. 0/3 Improve P4Merge mergetool invocationKevin Bracey, Mar 9, 2013
  16. 1/3 mergetools/p4merge: swap LOCAL and REMOTEKevin Bracey, Mar 9, 2013
  17. 2/3 mergetools/p4merge: create a base if none availableKevin Bracey, Mar 9, 2013
  18. Junio C HamanoMar 10, 2013
  19. 3/3 git-merge-one-file: revise merge error reportingKevin Bracey, Mar 9, 2013
  20. 1/3 mergetools/p4merge: swap LOCAL and REMOTEKevin Bracey, Mar 13, 2013
  21. 2/3 mergetools/p4merge: create a base if none availableKevin Bracey, Mar 13, 2013
  22. 3/3 git-merge-one-file: revise merge error reportingKevin Bracey, Mar 13, 2013
  23. David AguilarMar 13, 2013
  24. 0/3 git-merge-one-file error reportingKevin Bracey, Mar 24, 2013
  25. 1/3 git-merge-one-file: style cleanupKevin Bracey, Mar 24, 2013
  26. 2/3 git-merge-one-file: send "ERROR:" messages to stderrKevin Bracey, Mar 24, 2013
  27. 3/3 git-merge-one-file: revise merge error reportingKevin Bracey, Mar 24, 2013
  28. Junio C HamanoMar 25, 2013
  29. Junio C HamanoMar 25, 2013
  30. Junio C HamanoMar 25, 2013
  31. Eric SunshineMar 25, 2013
  32. Junio C HamanoMar 13, 2013
  33. Kevin BraceyMar 14, 2013
  34. Junio C HamanoMar 14, 2013
  35. Kevin BraceyMar 14, 2013
  36. Kevin BraceyMar 14, 2013
  37. David AguilarMar 13, 2013
  38. 1/2 mergetools/p4merge: swap LOCAL and REMOTEKevin Bracey, Mar 24, 2013
  39. 2/2 mergetools/p4merge: create a base if none availableKevin Bracey, Mar 24, 2013
  40. Junio C HamanoMar 25, 2013

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.