* git cvsimport: new tags not imported on second cvsimport
@ 2012-08-04 9:31 Ilya Basin
2012-08-04 9:45 ` Andreas Schwab
0 siblings, 1 reply; 6+ messages in thread
From: Ilya Basin @ 2012-08-04 9:31 UTC (permalink / raw)
To: git
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: git cvsimport: new tags not imported on second cvsimport
2012-08-04 9:31 git cvsimport: new tags not imported on second cvsimport Ilya Basin
@ 2012-08-04 9:45 ` Andreas Schwab
2012-08-04 13:01 ` Re[2]: " Ilya Basin
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Schwab @ 2012-08-04 9:45 UTC (permalink / raw)
To: Ilya Basin; +Cc: git
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.
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."
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re[2]: git cvsimport: new tags not imported on second cvsimport
2012-08-04 9:45 ` Andreas Schwab
@ 2012-08-04 13:01 ` Ilya Basin
2012-08-04 15:58 ` Andreas Schwab
0 siblings, 1 reply; 6+ messages in thread
From: Ilya Basin @ 2012-08-04 13:01 UTC (permalink / raw)
To: Andreas Schwab; +Cc: git
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?
How to make the git repo "forget" the last cvsimport?
--
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: git cvsimport: new tags not imported on second cvsimport
2012-08-04 13:01 ` Re[2]: " Ilya Basin
@ 2012-08-04 15:58 ` Andreas Schwab
2012-08-04 22:09 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Schwab @ 2012-08-04 15:58 UTC (permalink / raw)
To: Ilya Basin; +Cc: git
Ilya Basin <basinilya@gmail.com> writes:
> 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."
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: git cvsimport: new tags not imported on second cvsimport
2012-08-04 15:58 ` Andreas Schwab
@ 2012-08-04 22:09 ` Junio C Hamano
2012-08-04 22:20 ` Andreas Schwab
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2012-08-04 22:09 UTC (permalink / raw)
To: Andreas Schwab; +Cc: Ilya Basin, git
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...
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: git cvsimport: new tags not imported on second cvsimport
2012-08-04 22:09 ` Junio C Hamano
@ 2012-08-04 22:20 ` Andreas Schwab
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Schwab @ 2012-08-04 22:20 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Ilya Basin, git
Junio C Hamano <gitster@pobox.com> writes:
> 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."
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-08-04 22:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-04 9:31 git cvsimport: new tags not imported on second cvsimport Ilya Basin
2012-08-04 9:45 ` Andreas Schwab
2012-08-04 13:01 ` Re[2]: " Ilya Basin
2012-08-04 15:58 ` Andreas Schwab
2012-08-04 22:09 ` Junio C Hamano
2012-08-04 22:20 ` Andreas Schwab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).