From: Alan Chandler <alan@chandlerfamily.org.uk>
Date: Thu, 03 Nov 2005 22:17:14 GMT
Subject: Re: little conundrum
Message-ID: <200511032217.14362.alan@chandlerfamily.org.uk>
In-Reply-To: <20051103200631.GJ1431@pasky.or.cz>

On Thursday 03 Nov 2005 20:06, Petr Baudis wrote:
...
> But you actually do not want to do a merge, but:
>
> 	$ cd original-version
> 	$ cg-init
> 	$ cd ../modified-version
> 	$ cg-init
> 	$ cg-branch-add orig ../original-version
> 	$ cg-fetch orig
> 	$ echo `cg-object-id` `cg-object-id orig` >.git/info/grafts


very nice

I didn't know about the grafts stuff, but I can see what its doing.
-- 
Alan Chandler
http://www.chandlerfamily.org.uk
Open Source. It's the difference between trust and antitrust.