cvs-migration.txt

cvs-migration.txt

[J. Bruce Fields]

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.

Re: cvs-migration.txt

[Junio C Hamano]

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

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

Re: cvs-migration.txt

[Martin Langhoff]

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