From: Petr Baudis <pasky@suse.cz>
Date: Sun, 23 Oct 2005 22:32:40 GMT
Subject: Re: Merge failure problem with cogito: How to fixup?
Message-ID: <20051023223240.GU30889@pasky.or.cz>
In-Reply-To: <200510231557.j9NFvptA020919@inti.inf.utfsm.cl>

Dear diary, on Sun, Oct 23, 2005 at 05:57:51PM CEST, I got a letter
where Horst von Brand <vonbrand@inf.utfsm.cl> told me that...
> When doing the following:
> 
>    mkdir /tmp/tst1
>    cd /tmp/tst1
>    echo "Initial" | cg-init 
>       
>    cd /tmp
>    cg-clone tst1 tst2
>    
>    cd /tmp/tst1
>    echo 'Hi there!' > greet
>    cg-add greet
>    cg-commit -m "Add greet"
>    
>    cd /tmp/tst2
>    echo 'Hello!' > greet
>    cg-add greet
>    cg-commit -m "Add greet"
> 
>    cg-update
> 
> I get a message to the end that the merge doesn't work, and that I have to
> fix up by hand. The resulting greet file has no merge markers, plain
> "cg-diff" is useless. How am I supposed to find out what the problem is?
> 
> Yes, "cg-diff -r origin:HEAD" does the trick, but...

Well, yes, that's one of the "unhandled merge cases". :-)

To fixup:

	<resolve the merge somehow, probably adding greet in some form>
	cg-add greet

(You should be able to cg-rm greet instead if you decide to drop the
file after all.)

This is a _trick_ and it works just because cg-add and cg-rm purely
accidentally do the right GIT commands to also resolve an index-level
merge conflict. The proper solution would be to add the proper case to
cg-Xmergefile, which should be actually pretty easy, if only someone
does it... ;-)

Ok, and cg-status should be taught about it and report "greet" somehow
as a conflict until you choose one of the versions.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.