From: Johannes Schindelin Date: Sun, 10 Dec 2006 22:51:38 GMT Subject: Re: [PATCH 3/3] add test case for recursive merge Message-ID: In-Reply-To: <7vmz5w5tuw.fsf@assigned-by-dhcp.cox.net> Hi, On Sat, 9 Dec 2006, Junio C Hamano wrote: > Johannes Schindelin writes: > > > this test succeeds consistently on the machine where I tested it > > originally, but fails on another of my machines, but only when run without > > "-v". Very annoying. I will not have time to investigate until Monday, > > though. > > There seem to be cases where stage #1 contains blob 'B' or 'A' > or nothing depending on something totally random. Ring a bell? Not at all. It seems that one merge is conflicting on "a1", and not storing _anything_ in the resulting (unclean) tree. So, there is no stage 1. However, I also saw that something is left in stage 1 on the box where the problem arises. Tomorrow. Ciao, Dscho