Re: bogus merges

On Sun, Sep 11, 2005 at 11:11:49AM -0400, A Large Angry SCM wrote:

Martin Langhoff wrote:

quoted

On 9/11/05, Russell King [off-list ref] wrote:

quoted

On Mon, Sep 05, 2005 at 09:01:32AM -0700, Linus Torvalds wrote:

quoted

I suspect rmk is using cogito-0.13

Correct, and rmk will probably be extremely nervous about upgrading when
0.14 appears.

Well, *actually* cogito-0.13 didn't include git-core, so we have to
look for the reasons elsewhere. Could be the leftover MERGE_HEAD
Daniel mentions.

Russel, can you confirm what git-core version you are/were running?

Russel,

How are you updating your tree to Linus'? If you are rsyncing from 
kernel.org, you're probably getting a MERGE_HEAD with the rsync. A while 
ago I got annoyed enough add the equivalent of:

	rm -f ${LOCAL_REPOS}/.git/MERGE_HEAD

to my (very stupid) git rsync script.

I think you can forget MERGE_HEAD.  Why?  I use cogito for pulling.

cg-pull gets the head, and then rsyncs the objects found in the object
directory.  It doesn't touch MERGE_HEAD.  None of the cogito scripts
that I have know anything about MERGE_HEAD itself.

(Plus, it's actually a two stage pull - I have a cron-based cg-pull
into a master repository on one box, which I then cg-pull to the
development box which is only powered when I'm working.)

-- 
Russell King