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

Re: What's cooking in git.git (Jul 2009, #02; Sun, 26)

From
Alex Riesen <raa.lkml@gmail.com>
Date
Jul 27, 2009, 14:09 UTC
Message-ID
<81b0412b0907270709kd6a5b8fy51829099d7b488e5@mail.gmail.com>
In-Reply-To
<7viqhfrfu5.fsf@alter.siamese.dyndns.org>
On Sun, Jul 26, 2009 at 10:47, Junio C Hamano<gitster@pobox.com> wrote:
Show 7 quoted lines
> * ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
>  - Fix for a merge where a branch has an F->D transition
>  - Add a reminder test case for a merge with F/D transition
>
> Although the reported breakage is covered with the patch, Alex feels the
> solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
> may be long overdue but seems to be a hard problem.

Maybe promote the testcase patch to master and drop (or leave it in next) the other patch? So that the reminder reminds not only people running next but also anyone who happens to look at the output of their test suite run.

Previous: Johannes SchindelinNext: Paolo Bonzini
Message 8 of 11 in “What's cooking in git.git (Jul 2009, #02; Sun, 26)”
  1. Junio C HamanoJul 26, 2009
  2. Jakub NarebskiJul 26, 2009
  3. en/fast-export, was Re: What's cooking in git.git (Jul 2009, #02; Sun, 26)Johannes Schindelin, Jul 26, 2009
  4. db/transport-shim, was Re: What's cooking in git.git (Jul 2009, #02; Sun, 26)Johannes Schindelin, Jul 26, 2009
  5. Michael HaggertyJul 26, 2009
  6. gp/maint-rebase-p-onto, was Re: What's cooking in git.git (Jul 2009, #02; Sun, 26)Johannes Schindelin, Jul 26, 2009
  7. Johannes SchindelinJul 26, 2009
  8. Alex RiesenJul 27, 2009
  9. Paolo BonziniJul 28, 2009
  10. Junio C HamanoJul 28, 2009
  11. Paolo BonziniJul 28, 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.