Skip to contentSkip to conversation

git cvsimport: new tags not imported on second cvsimport

DISCUSSION Ilya Basin 3 participants 6 messages Jun 15, 2016

lore
Share & tools
lore

Ilya Basin

author
#0 lore raw

I made the initial import:
git cvsimport -d :pserver:user@blackbird:10010/data/cvs/webgui -C SAP -r cvs -k SAP

edited .git/config:
[cvsimport]
module = SAP
r = cvs
d = :pserver:user@blackbird:10010/data/cvs/webgui

did some commits to CVS and created a new tag

Then ran:
git cvsimport -ak
To synchronize with CVS.

The new commits were imported, but the new tag wasn't.
I made initial import again to another directory and the new tag was in it.

#1 lore raw
Quoted 9 lines · Ilya Basin

I made the initial import:
git cvsimport -d :pserver:user@blackbird:10010/data/cvs/webgui -C SAP -r cvs -k SAP

edited .git/config:
[cvsimport]
module = SAP
r = cvs
d = :pserver:user@blackbird:10010/data/cvs/webgui

Quoted 7 lines

did some commits to CVS and created a new tag

Then ran:
git cvsimport -ak
To synchronize with CVS.

The new commits were imported, but the new tag wasn't.

cvsimport never reconsiders changesets that were already imported, so if the tag was added to such a changeset it won't be seen.

Andreas.

Signature · 3 lines
Andreas Schwab, [email protected]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
author
#2 lore raw
Quoted 9 lines · AS> Ilya Basin <[email protected]> writes:
Quoted 9 lines

I made the initial import:
git cvsimport -d :pserver:user@blackbird:10010/data/cvs/webgui -C SAP -r cvs -k SAP

edited .git/config:
[cvsimport]
module = SAP
r = cvs
d = :pserver:user@blackbird:10010/data/cvs/webgui

Quoted 7 lines
Quoted 7 lines

did some commits to CVS and created a new tag

Then ran:
git cvsimport -ak
To synchronize with CVS.

The new commits were imported, but the new tag wasn't.

AS> cvsimport never reconsiders changesets that were already imported, so if AS> the tag was added to such a changeset it won't be seen.

AS> Andreas.

Do you mean, if I tag BEFORE cvsimport, it will be imported? How to make the git repo "forget" the last cvsimport?

#3 lore raw
Quoted 19 lines · Ilya Basin
Quoted 9 lines · AS> Ilya Basin <[email protected]> writes:
Quoted 9 lines

I made the initial import:
git cvsimport -d :pserver:user@blackbird:10010/data/cvs/webgui -C SAP -r cvs -k SAP

edited .git/config:
[cvsimport]
module = SAP
r = cvs
d = :pserver:user@blackbird:10010/data/cvs/webgui

Quoted 7 lines
Quoted 7 lines

did some commits to CVS and created a new tag

Then ran:
git cvsimport -ak
To synchronize with CVS.

The new commits were imported, but the new tag wasn't.

Quoted 7 lines

AS> cvsimport never reconsiders changesets that were already imported, so if AS> the tag was added to such a changeset it won't be seen.

AS> Andreas.

Do you mean, if I tag BEFORE cvsimport, it will be imported?

If you tag one of the new commits it will be imported.

Quoted 1 line

How to make the git repo "forget" the last cvsimport?

Reset the branch back to before the import.

Andreas.

Signature · 3 lines
Andreas Schwab, [email protected]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
#4 lore raw
Quoted 1 line · Andreas Schwab

Reset the branch back to before the import.

Does the resulting history created by cvsimport after resetting a branch back to an older point exactly match the history before resetting (obviously modulo the tag that has been added since the original import)?

I recall that cvsimport tried hard to be reproducible and it should work, but I haven't run cvsimport myself for a long time, so...

#5 lore raw
Quoted 8 lines · Junio C Hamano
Quoted 1 line · Andreas Schwab

Reset the branch back to before the import.

Does the resulting history created by cvsimport after resetting a branch back to an older point exactly match the history before resetting (obviously modulo the tag that has been added since the original import)?

Usually it does.

Quoted 2 lines

I recall that cvsimport tried hard to be reproducible and it should work, but I haven't run cvsimport myself for a long time, so...

As long as cvsps detects the same changesets.

Andreas.

Signature · 3 lines
Andreas Schwab, [email protected]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."