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

Re: Segfault on merge with 1.6.2.1

From
Michael Johnson <redbeard@mdjohnson.us>
Date
Apr 1, 2009, 05:43 UTC
Message-ID
<op.uro0u0xuso3nzr@sulidor.mdjohnson.us>
In-Reply-To
<op.urnad7jbso3nzr@sulidor.mdjohnson.us>

On Tue, 31 Mar 2009 02:14:21 -0500, Michael Johnson <redbeard@mdjohnson.us> wrote:

Show 5 quoted lines
> That said, here's my backtrace. I've tried tracing through to figure out  
> where the problem is occurring, but my gdb-foo is non-existent, I'm  
> wating for some GUIs to install, and I'm ready for some sleep :| So if I  
> haven't heard back by tomorrow evening, I'll be running one of the  
> frontends for gdb until I have something traced down :)

I tried tracing it manually with KDbg tonight. But either I'm too tired (and my patience is low), or I'm just not capable of understanding it. I hope it's the former, since I was able to follow the basic flow well enough. But I still wasn't terribly happy with the front end. It's obvious that gdb is awesome, I'm just not ready for it yet :)

Anyway, I decided to try an experiment, as I had mentioned to someone that if I couldn't get this bug tracked down, I'd have to do the merge manually. So... I figured out the common ancestor (I used git show-branch, but I'm betting there's an easier way), and merged the ancestor + 1 of the other branch into my HEAD. It segfaulted. So, I tried the resolve strategy at the same point. Amazingly, it worked. And a default recursive merge handled the rest.

That means my current problem is resolved, but I'm guessing a segfault on a default merge is still a bad thing, so I'll try to keep up on this. I do have a copy of the repository before the merge (several, right now, actually), so I can try fixes. If I'm lucky I'll have some time to work on it myself. But it will be at least two weeks before I actually have the time to personally track down the problem without help. However, I should be able to assist someone else fairly easily.

In short, I don't personally need a fix right now, but I can help figure out what is broken with it.

Thanks, Michael

-- 
Michael D Johnson   <redbeard@mdjohnson.us>    
redbeardcreator.deviantart.com

"Marketing research...[has] shown that energy weapons that make sounds sell
  better..." - Kevin Siembieda (Rifts Game Master Guide, pg 111)
Previous: Michael JohnsonNext: Miklos Vajna
Message 7 of 18 in “Segfault on merge with 1.6.2.1”
  1. Michael JohnsonMar 28, 2009
  2. Miklos VajnaMar 29, 2009
  3. Michael JohnsonMar 30, 2009
  4. Johannes SchindelinMar 30, 2009
  5. Miklos VajnaMar 30, 2009
  6. Michael JohnsonMar 31, 2009
  7. Michael JohnsonApr 1, 2009
  8. Miklos VajnaApr 1, 2009
  9. Clemens BuchacherApr 1, 2009
  10. Michael JohnsonApr 2, 2009
  11. Clemens BuchacherApr 5, 2009
  12. 1/3 add tests for merging with submodulesClemens Buchacher, Apr 5, 2009
  13. 2/3 update cache for conflicting submodule entriesClemens Buchacher, Apr 5, 2009
  14. 3/3 simplify output of conflicting mergeClemens Buchacher, Apr 5, 2009
  15. Junio C HamanoApr 5, 2009
  16. Johannes SchindelinApr 5, 2009
  17. Michael JohnsonApr 6, 2009
  18. Clemens BuchacherApr 6, 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.