threads / discuss / 3078

cvs-migration.txt

Subject: cvs-migration.txt

## tl;dr

3 messages between Jan 15, 2006 and Jan 16, 2006.

replies: 2people: 3as markdown or json

J. Bruce Fields· Jan 15, 2006, 19:58 UTC · lore

I find the following sentence from cvs-migration.txt slightly confusing:

	"The cut-off is date-based, so don't change the branches that
	were imported from CVS."

I assume the branches referrred to are the target git branches, not the source CVS branches? (And are date-based cut-offs really the essential reason for this restriction?)

--b.

Junio C Hamano· Jan 15, 2006, 21:11 UTC · re: J. Bruce Fields · lore

Re: cvs-migration.txt

"J. Bruce Fields" <bfields@fieldses.org> writes:

Show 8 quoted lines

> I find the following sentence from cvs-migration.txt slightly confusing:
>
> 	"The cut-off is date-based, so don't change the branches that
> 	were imported from CVS."
>
> I assume the branches referrred to are the target git branches, not the
> source CVS branches?  (And are date-based cut-offs really the essential
> reason for this restriction?)

Sorry, I cannot answer this one immediately without researching myself; I do not use cvsimport.

The way I read the code agrees with you. The date from the topmost commit from each git branch is read, and used to limit the changes we read from CVS into them. The code reads from "author date", which is technically incorrect, but what we are saying here is that you should never commit into these branches yourself and let cvsimport be the only one that touch them, so using commiter date and author date would not make a difference.

Martin Langhoff· Jan 16, 2006, 01:31 UTC · re: Junio C Hamano · lore

Re: cvs-migration.txt

On 1/16/06, Junio C Hamano <junkio@cox.net> wrote:

> what we are
> saying here is that you should never commit into these branches
> yourself and let cvsimport be the only one that touch them, so
> using commiter date and author date would not make a difference.

Exactly. You should make a new head off the one imported from cvs, and work there. This supports continued use of cvsimport if the cvs repo is still active. To bring in those changes you will have to merge them into your branch.

If you are 200% certain that the cvs repo is going to be removed immediately, you can ignore this advice. Run the cvsimport once, and then start developing on top. If you do this, however, don't run that cvsimport ever again, for it will mess up things royally ;)

But it's a bad idea to keep using the same branches in any case. Life is saner if you work on new heads.

martin