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

Re: [PATCH] merge-recursive: add/add really is modify/modify with an empty base

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Dec 14, 2006, 11:31 UTC
Message-ID
<b0943d9e0612140331q4c3a32e2l361fd04375f091d7@mail.gmail.com>
In-Reply-To
<Pine.LNX.4.63.0612140045430.3635@wbgn013.biozentrum.uni-wuerzburg.de>
On 13/12/06, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> xdl_merge(), as Git uses it, tries harder to find the true conflicts. So,
> if the files actually differ in only one line, just this line will be
> shown as conflict.
I gave the latest GIT a try and it works OK with StGIT.

This new merge looks much better than diff3 (or rcs merge) because it only shows the true conflicts.

What it the relation between git-merge-recursive and "git-read-tree -m" (if any)? I currently still use "git-read-tree -m" for some merges because of the speed gain due to the --agressive option (really noticeable when picking a patch from an older branch). Probably git-merge-recursive cannot implement this since it needs to track deletion/additions for rename detection.

Are there any other things to be aware if I completely replace the "git-read-tree + diff3" with git-merge-recursive?

One nice addition to git-merge-recursive (probably only useful to StGIT) would be more meaningful labeling of the conflict regions, passed via a command line similar to the "diff3 -L" option. StGIT generates "patched", "current" and "ancestor" labels with diff3.

Yet another nice feature would be the ancestor region (which diff3 doesn't add either but it gets added by emacs' ediff-merge-files-with-ancestor function if you use the interactive merge with StGIT).

Previous: Johannes SchindelinNext: Shawn Pearce
Message 33 of 37 in “Make sure the empty tree exists when needed in merge-recursive.”
  1. 1/1 Make sure the empty tree exists when needed in merge-recursive.Shawn O. Pearce, Dec 7, 2006
  2. 1/3 diff_tree_sha1(): avoid rereading trees if possibleJohannes Schindelin, Dec 9, 2006
  3. Junio C HamanoDec 10, 2006
  4. Johannes SchindelinDec 10, 2006
  5. 2/3 merge-recursive: make empty tree a known objectJohannes Schindelin, Dec 9, 2006
  6. Linus TorvaldsDec 10, 2006
  7. Junio C HamanoDec 10, 2006
  8. Linus TorvaldsDec 10, 2006
  9. Junio C HamanoDec 10, 2006
  10. Linus TorvaldsDec 10, 2006
  11. Junio C HamanoDec 10, 2006
  12. Johannes SchindelinDec 10, 2006
  13. 3/3 add test case for recursive mergeJohannes Schindelin, Dec 9, 2006
  14. Johannes SchindelinDec 10, 2006
  15. Junio C HamanoDec 10, 2006
  16. Johannes SchindelinDec 10, 2006
  17. t6024: fix timing problemJohannes Schindelin, Dec 12, 2006
  18. Junio C HamanoDec 12, 2006
  19. Johannes SchindelinDec 12, 2006
  20. merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin, Dec 13, 2006
  21. Junio C HamanoDec 13, 2006
  22. StGit repo & gitweb, was Re: [PATCH] merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin, Dec 13, 2006
  23. Jakub NarebskiDec 13, 2006
  24. Catalin MarinasDec 13, 2006
  25. Robin RosenbergDec 13, 2006
  26. Johannes SchindelinDec 13, 2006
  27. Jakub NarebskiDec 13, 2006
  28. Petr BaudisDec 19, 2006
  29. Jakub NarebskiDec 19, 2006
  30. Catalin MarinasDec 13, 2006
  31. Junio C HamanoDec 13, 2006
  32. Johannes SchindelinDec 13, 2006
  33. Catalin MarinasDec 14, 2006
  34. Shawn PearceDec 14, 2006
  35. Shawn PearceDec 14, 2006
  36. Johannes SchindelinDec 14, 2006
  37. Catalin MarinasDec 14, 2006

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.