(unknown)

From: Michael Witten <mfwitten@mit.edu>
Date: Oct 13, 2007, 04:01 UTC
Message-ID: <30817A88-4313-4D38-95B0-FEC47C651CB0@mit.edu>

I apologize if this is received twice. I did add some comments, though!

On 12 Oct 2007, at 10:49:10 PM, Jeff King wrote:

Show 6 quoted lines

> You are presumably doing a 'git-pull' on the cvsimport-ed commits. Try
> doing a git-rebase, which will filter out commits which make the same
> changes. Yes, it means throwing away your original commits, but the  
> new
> ones should be morally equivalent (and are now the "official" upstream
> of the CVS repository).

Now that you mention it, I think the best approach would be to:
	
	(1) cvsexportcommit
	(2) git reset --hard LAST_CVS_IMPORT_AND_MERGE
	(3) git cvsimport ..... # and merge

I think this is what you mean; it seems to me that rebasing isn't quite that.

However, this will not preserve more complicated history such as merges from another git repository.

Basically, I want to treat my git repository as the official repository; the CVS repo is just their for the old farts to get the latest stuff ;-P

Thanks!

Michael

PS Please send me other opinions.