git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Imports without Tariffs

From
Jeff King <peff@peff.net>
Date
Oct 13, 2007, 02:49 UTC
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:
Show 14 quoted lines
> 		(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
Previous: mfwitten@mit.eduNext: Michael Witten
Message 2 of 3 in “Imports without Tariffs”
  1. mfwitten@mit.eduOct 12, 2007
  2. Jeff KingOct 13, 2007
  3. Michael WittenOct 13, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.