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

Re: [StGit PATCH 2/6] Don't try to merge files that merge-recursive already merged

From
Karl Hasselström <kha@treskal.com>
Date
Aug 22, 2007, 09:59 UTC
Message-ID
<20070822095954.GE30748@diana.vm.bytemark.co.uk>
In-Reply-To
<20070822094413.GC30748@diana.vm.bytemark.co.uk>
On 2007-08-22 11:44:13 +0200, Karl Hasselström wrote:
Show 9 quoted lines
> On 2007-08-22 11:37:03 +0200, David Kågedal wrote:
>
> > I think that the push(c) commits will never happen with my
> > patches, so the test case needs an update.
>
> Actually, the failure vanishes once the next patch in the series is
> applied. I thought this was a good thing, but if they're never
> supposed to happen, maybe the test is still broken, just not in a
> way that's detected?

No, after path 2 we don't get a push(c) entry, and the test fails, but after patch 3 we get it again and the test succeeds.

Looking at the code (the string "push(c)" occurs exactly once, so it's easy to find), it seems the log stuff continues to work as expected after patch 3: it writes a "push(c)" entry when the patch becomes empty due to conflicts, and its entire contents are dumped in the wd (or the index+wd with your patches). So it is just patch 2 that needs fixing -- and I suspect the fix might be to merge it with patch 3.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
Previous: Karl HasselströmNext: Karl Hasselström
Message 11 of 18 in “Use git conflict handling on push”
  1. 0/6 Use git conflict handling on pushDavid Kågedal, Aug 20, 2007
  2. 1/6 Split git.merge into two functionsDavid Kågedal, Aug 20, 2007
  3. 2/6 Don't try to merge files that merge-recursive already mergedDavid Kågedal, Aug 20, 2007
  4. 3/6 Don't touch state after conflict in pushDavid Kågedal, Aug 20, 2007
  5. 4/6 Added a test case to check what happens when push finds a conflictDavid Kågedal, Aug 20, 2007
  6. 5/6 Simplify merge_recursiveDavid Kågedal, Aug 20, 2007
  7. 6/6 Use the output from merge-recursive to list conflictsDavid Kågedal, Aug 20, 2007
  8. Karl HasselströmAug 22, 2007
  9. David KågedalAug 22, 2007
  10. Karl HasselströmAug 22, 2007
  11. Karl HasselströmAug 22, 2007
  12. Leave working dir and index alone after failed (conflicting) pushKarl Hasselström, Aug 22, 2007
  13. David KågedalAug 20, 2007
  14. Junio C HamanoAug 20, 2007
  15. Uwe Kleine-KönigAug 21, 2007
  16. Junio C HamanoAug 22, 2007
  17. Karl HasselströmAug 22, 2007
  18. Catalin MarinasAug 23, 2007

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.