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

Re: "tla missing -s" equivalent with git/cogito

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Jan 18, 2006, 19:07 UTC
Message-ID
<46a038f90601181107h57e6fb73peb199689349aec41@mail.gmail.com>
In-Reply-To
<20060118185542.GT28365@pasky.or.cz>
On 1/19/06, Petr Baudis <pasky@suse.cz> wrote:
> Now you want to merge the branch as a whole. Cherrypicking-aware VCS
> would just merge the patch2, but you are taking the whole diff:
...
> And you get a conflict instead of b\nc.

While I haven't tested your particular example, it looks to me like git-cherry would identify it correctly. So far my experience has been that git-cherry's strategy detects my cherry-picked patches pretty well.

Why would it not work in your example? Patch 1 has clearly been applied in both branches, and git-cherry would normally detect that alright.

btw, when is cg-merge switching to use git-merge? :-p
martin
Previous: Petr BaudisNext: Petr Baudis
Message 9 of 10 in “"tla missing -s" equivalent with git/cogito”
  1. Belmar-LetelierJan 18, 2006
  2. Andreas EricssonJan 18, 2006
  3. Junio C HamanoJan 18, 2006
  4. Martin LanghoffJan 18, 2006
  5. Petr BaudisJan 18, 2006
  6. Martin LanghoffJan 18, 2006
  7. Martin LanghoffJan 18, 2006
  8. Petr BaudisJan 18, 2006
  9. Martin LanghoffJan 18, 2006
  10. Petr BaudisJan 18, 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.