Re: Segfault on merge with 1.6.2.1

On Sat, 04 Apr 2009 19:46:57 -0500, Clemens Buchacher [off-list ref]  
wrote:

The segmentation fault is caused by a null pointer dereference which  
happens during recursive merge with a submodule conflict between two
merge bases. This is fixed by the following patches.

Amazingly I follow that. And the tracing I was doing now makes sense. I  
saw the null pointer dereference, but couldn't figure out why. The  
submodule conflict explains some things about what was going on in the  
tree.

+# history
+#
+#        a --- c
+#      /   \ /
+# root      X
+#      \   / \
+#        b --- d

This also explains a lot. Is there any way to get this sort of simplified  
representation from the existing tools? I would think gitk would show it,  
but would I be able to recognize it.?

However, there are other problems with merging submodules. For example,  
git diff aborts with "fatal: read error 'sub'" for conflicting  
submodules.
I have also added a test for this.

I believe there's a GSoC proposal that would help with this... from what I  
read of it, it could prove very helpful to my workflow.

Anyway, thanks for all the help. I'll merge the patches in locally and see  
if they work for me when I get a bit of time. I'm sure they will... it's  
just for my own peace of mind.

Thanks again,
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)