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

git-cvs-import and branches

From
MMMartin Mares <mj@ucw.cz>
Date
Feb 17, 2006, 19:55 UTC
Message-ID
<mj+md-20060217.193815.10412.albireo@ucw.cz>
Hello!

I'm git-importing a rather large CVS repository with lots of branches and although the mainline is imported correctly, the branches aren't. They usually contain some changes introduced to the ancestor branch after the point the new branch has been tagged.

I haven't studied git-cvsimport and cvsps in much detail yet, but it seems that git-cvsimport forks off the branch at the first patchset reported by cvsps which mentions the branch and copies the current state of the ancestor branch at that time.

This doesn't seem to be correct, since many changes might have happened to the ancestor branch since the real branching point. However, since cvsps doesn't report the branching points (and they aren't exact points anyway since tagging is not atomic in CVS), I don't see how to make cvsimport find the right starting revision.

Does anybody have an idea how to solve this?
				Have a nice fortnight
-- 
Martin `MJ' Mares   <mj@ucw.cz>   http://atrey.karlin.mff.cuni.cz/~mj/
Faculty of Math and Physics, Charles University, Prague, Czech Rep., Earth
COBOL -- Completely Outdated, Badly Overused Language
Next: David Mansfield
Message 1 of 2 in “git-cvs-import and branches”
  1. Martin MaresFeb 17, 2006
  2. David MansfieldFeb 17, 2006

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.