# git cvsimport: new tags not imported on second cvsimport 6 messages from 2012-08-04 to 2012-08-04. Participants: Ilya Basin, Andreas Schwab, Junio C Hamano. Thread: https://gitlist.dev/t/31184 ## Ilya Basin, 2012-08-04 09:31 Subject: git cvsimport: new tags not imported on second cvsimport Message-ID: <1123570348.20120804133108@gmail.com> URL: https://gitlist.dev/e/1123570348.20120804133108%40gmail.com ``` 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, 2012-08-04 09:45 Subject: Re: git cvsimport: new tags not imported on second cvsimport Message-ID: URL: https://gitlist.dev/e/m2lihvt2gi.fsf%40linux-m68k.org In-Reply-To: <1123570348.20120804133108@gmail.com> ``` Ilya Basin 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." ``` ## Ilya Basin, 2012-08-04 13:01 Subject: Re[2]: git cvsimport: new tags not imported on second cvsimport Message-ID: <9510482012.20120804170149@gmail.com> URL: https://gitlist.dev/e/9510482012.20120804170149%40gmail.com In-Reply-To: ``` AS> Ilya Basin 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? -- ``` ## Andreas Schwab, 2012-08-04 15:58 Subject: Re: git cvsimport: new tags not imported on second cvsimport Message-ID: URL: https://gitlist.dev/e/m2pq76vecd.fsf%40igel.home In-Reply-To: <9510482012.20120804170149@gmail.com> ``` Ilya Basin writes: > AS> Ilya Basin 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, 2012-08-04 22:09 Subject: Re: git cvsimport: new tags not imported on second cvsimport Message-ID: <7v7gte9una.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v7gte9una.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Andreas Schwab 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, 2012-08-04 22:20 Subject: Re: git cvsimport: new tags not imported on second cvsimport Message-ID: URL: https://gitlist.dev/e/m2lihuuwnz.fsf%40igel.home In-Reply-To: <7v7gte9una.fsf@alter.siamese.dyndns.org> ``` Junio C Hamano writes: > Andreas Schwab 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." ```