From: Ryan Anderson <ryan@michonline.com>
Date: Wed, 18 Jan 2006 14:39:17 GMT
Subject: Re: Joining Repositories
Message-ID: <43CE5315.8060008@michonline.com>
In-Reply-To: <20060118142139.GQ28365@pasky.or.cz>

Petr Baudis wrote:

>Dear diary, on Wed, Jan 18, 2006 at 03:09:17PM CET, I got a letter
>where Ryan Anderson <ryan@michonline.com> said that...
>  
>
>>... Why would that be the optimal method?
>>
>Ow. I suppose that's what you call "blinded by invalid implicit
>assumptions". Obviously, if you are ok with such a grand move, this is
>the best.
>  
>
Sorry, that came out a bit harsher than I had intended.

>This also reminds me that I should finally merge the cg-mv patch.
>
>>	git fetch ../r1/
>>	GIT_INDEX_FILE=.git/tmp-index git-read-tree FETCH_HEAD
>>	GIT_INDEX_FILE=.git/tmp-index git-checkout-cache -a -u
>>	git-update-cache --add -- $(GIT_INDEX_FILE=.git/tmp-index git-ls-files)
>>	cp .git/FETCH_HEAD .git/MERGE_HEAD
>>	git commit
>>    
>>
>
>But if you want to have an idea what's actually going on on the high
>level, perhaps the
>
>	cd r2
>	cg-branch-add r1 ../r1/.git
>	cg-fetch r1
>	cg-merge -j r1
>
>might be easier. ;-)
>
Ah, yes, cg-merge seems like it might be somewhat simpler here.


-- 

Ryan Anderson
  sometimes Pug Majere