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

Re: [PATCH/Test] Build in merge is broken

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Jul 13, 2008, 12:41 UTC
Message-ID
<20080713124100.GB10347@genesis.frugalware.org>
In-Reply-To
<loom.20080713T073129-112@post.gmane.org>
On Sun, Jul 13, 2008 at 08:13:55AM +0000, Sverre Hvammen Johansen <hvammen+git@gmail.com> wrote:
Show 8 quoted lines
> Great that we now are introducing merge in C.  Great job Miklos.
> However, it is broken as this patch shows.  This have been
> bisected to 1c7b76be Build in merge.
> 
> The test case when run will record the parents that were asked for which is
> fine.  However, only c2 is recorded as a parent in the commit object.  Both
> c1 and c2 should have been recorded.  The merge is otherwise working
> correctly.
Thanks for the testcase, I'm on it. ;-)
Previous: Sverre Hvammen JohansenNext: Miklos Vajna
Message 2 of 7 in “Build in merge is broken”
  1. Build in merge is brokenSverre Hvammen Johansen, Jul 13, 2008
  2. Miklos VajnaJul 13, 2008
  3. Miklos VajnaJul 13, 2008
  4. Miklos VajnaJul 13, 2008
  5. Junio C HamanoJul 13, 2008
  6. Sverre Hvammen JohansenJul 14, 2008
  7. Junio C HamanoJul 14, 2008

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.