Re: Segfault on merge with 1.6.2.1

On Tue, 31 Mar 2009 02:14:21 -0500, Michael Johnson  
[off-list ref] wrote:

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   [off-list ref]    
redbeardcreator.deviantart.com

"Marketing research...[has] shown that energy weapons that make sounds sell
  better..." - Kevin Siembieda (Rifts Game Master Guide, pg 111)