threads / discuss / 31184

git cvsimport: new tags not imported on second cvsimport

Subject: git cvsimport: new tags not imported on second cvsimport

## tl;dr

6 messages between Aug 4, 2012 and Aug 4, 2012.

replies: 5people: 3as markdown or json

Ilya Basin· Aug 4, 2012, 09:31 UTC · lore

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.

Andreas Schwab· Aug 4, 2012, 09:45 UTC · re: Ilya Basin · lore

Re: git cvsimport: new tags not imported on second cvsimport

Ilya Basin <basinilya@gmail.com> writes:

Show 16 quoted 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
>
> 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.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Ilya Basin· Aug 4, 2012, 13:01 UTC · re: Andreas Schwab · lore

Re[2]: git cvsimport: new tags not imported on second cvsimport

AS> Ilya Basin <basinilya@gmail.com> writes:

Show 16 quoted 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
>>
>> 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?

Andreas Schwab· Aug 4, 2012, 15:58 UTC · re: Ilya Basin · lore

Re: git cvsimport: new tags not imported on second cvsimport

Ilya Basin <basinilya@gmail.com> writes:

Show 26 quoted lines

> AS> Ilya Basin <basinilya@gmail.com> writes:
>
>>> 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.
>
> 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.

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

Reset the branch back to before the import.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Junio C Hamano· Aug 4, 2012, 22:09 UTC · re: Andreas Schwab · lore

Re: git cvsimport: new tags not imported on second cvsimport

Andreas Schwab <schwab@linux-m68k.org> writes:

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

Andreas Schwab· Aug 4, 2012, 22:20 UTC · re: Junio C Hamano · lore

Re: git cvsimport: new tags not imported on second cvsimport

Junio C Hamano <gitster@pobox.com> writes:

Show 8 quoted lines

> Andreas Schwab <schwab@linux-m68k.org> writes:
>
>> 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.

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

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."