From: Jeff King <peff@peff.net>
Date: Sat, 13 Oct 2007 02:49:10 GMT
Subject: Re: Imports without Tariffs
Message-ID: <20071013024910.GA26386@coredump.intra.peff.net>
In-Reply-To: <1C0D32ED-59F7-43D4-88B1-D7A9E754D639@mit.edu>

On Fri, Oct 12, 2007 at 04:36:29PM -0400, mfwitten@MIT.EDU wrote:

> 		(4) Update my git working tree from CVS (at some later time).
> 			
> 			=> cd ../work
> 			=> git cvsimport -a -k -v -r cvs -C . module
> 		
> [PROBLEM]
> 	
> 	git-cvsimport creates new hash IDs for the same ol' commits.
>
> [...]
> 	Therefore, when the updated 'cvs' remote branches are merged into
> 	my local branches, git treats the commits I made with cvsexportcommit
> 	as separate history; thus, history is duplicated and merge commits
> 	appear where they shouldn't.

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

-Peff