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

Re: git-cvsimport - losing changes in subsequent pulls of a CVS branch that I thought I wasn't modifying in the GIT repo.

From
Matthias Urlichs <smurf@smurf.noris.de>
Date
Aug 20, 2008, 07:52 UTC
Message-ID
<20080820075234.GF4047@smurf.noris.de>
In-Reply-To
<48ABCBFD.7070503@alum.mit.edu>
Hi,
Michael Haggerty:
> cvs2svn/cvs2git does not support this (called "incremental imports").
git-cvsimport tries to.
> It is quite hard to implement robustly.  In fact, I claim that no tool
> handles incremental imports robustly, despite the fact that some claim
> to do so :-)
>

As people are habitually mucking with their CVS repositories, your best way to reliably do an incremental import is to do a regular import, put the two trees into the same git repository (easily achieved by a line in .git/objects/info/alternates and strategic copying of the tip-of-tree references), and git-rebase your non-CVS work.

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
When mutilating cattle, avoid the ones with testicles.
		-- The Evil Cultist List
Previous: Michael Haggerty
Message 5 of 5 in “git-cvsimport - losing changes in subsequent pulls of a CVS branch that I thought I wasn't modifying in the GIT repo.”
  1. Pete/Piet DelaneyAug 19, 2008
  2. Michael HaggertyAug 20, 2008
  3. Pete/Piet DelaneyAug 20, 2008
  4. Michael HaggertyAug 20, 2008
  5. Matthias UrlichsAug 20, 2008

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.