Re: Joining Repositories

From: Petr Baudis <pasky@suse.cz>
Date: Jan 18, 2006, 14:21 UTC
Message-ID: <20060118142139.GQ28365@pasky.or.cz>
In-Reply-To: <20060118140917.GA15438@mythryan2.michonline.com>

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.

This also reminds me that I should finally merge the cg-mv patch.

Show 6 quoted lines

> 	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. ;-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Of the 3 great composers Mozart tells us what it's like to be human,
Beethoven tells us what it's like to be Beethoven and Bach tells us
what it's like to be the universe.  -- Douglas Adams