{"thread":{"id":"31184","subject":"git cvsimport: new tags not imported on second cvsimport","startedAt":"2012-08-04T09:31:08Z","lastAt":"2012-08-04T22:20:16Z","messageCount":6,"participants":["Ilya Basin","Andreas Schwab","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"196454","messageId":"1123570348.20120804133108@gmail.com","threadId":"31184","inReplyTo":null,"subject":"git cvsimport: new tags not imported on second cvsimport","fromName":"Ilya Basin","fromEmail":"basinilya@gmail.com","sentAt":"2012-08-04T09:31:08Z","receivedAt":"2012-08-04T09:31:08Z","isPatch":false,"sender":{"key":"basinilya@gmail.com","avatar":null},"body":"I made the initial import:\n git cvsimport -d :pserver:user@blackbird:10010/data/cvs/webgui -C SAP -r cvs -k SAP\n\nedited .git/config:\n [cvsimport]\n module = SAP\n r = cvs\n d = :pserver:user@blackbird:10010/data/cvs/webgui\n\ndid some commits to CVS and created a new tag\n\nThen ran:\n git cvsimport -ak\nTo synchronize with CVS.\n\nThe new commits were imported, but the new tag wasn't.\nI made initial import again to another directory and the new tag was\nin it.\n"},{"id":"196455","messageId":"m2lihvt2gi.fsf@linux-m68k.org","threadId":"31184","inReplyTo":"1123570348.20120804133108@gmail.com","subject":"Re: git cvsimport: new tags not imported on second cvsimport","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-08-04T09:45:49Z","receivedAt":"2012-08-04T09:45:49Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Ilya Basin writes:\n\n> I made the initial import:\n> git cvsimport -d :pserver:user@blackbird:10010/data/cvs/webgui -C SAP -r cvs -k SAP\n>\n> edited .git/config:\n> [cvsimport]\n> module = SAP\n> r = cvs\n> d = :pserver:user@blackbird:10010/data/cvs/webgui\n>\n> did some commits to CVS and created a new tag\n>\n> Then ran:\n> git cvsimport -ak\n> To synchronize with CVS.\n>\n> The new commits were imported, but the new tag wasn't.\n\ncvsimport never reconsiders changesets that were already imported, so if\nthe tag was added to such a changeset it won't be seen.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"196456","messageId":"9510482012.20120804170149@gmail.com","threadId":"31184","inReplyTo":"m2lihvt2gi.fsf@linux-m68k.org","subject":"Re[2]: git cvsimport: new tags not imported on second cvsimport","fromName":"Ilya Basin","fromEmail":"basinilya@gmail.com","sentAt":"2012-08-04T13:01:49Z","receivedAt":"2012-08-04T13:01:49Z","isPatch":false,"sender":{"key":"basinilya@gmail.com","avatar":null},"body":"AS> Ilya Basin writes:\n\n>> I made the initial import:\n>> git cvsimport -d :pserver:user@blackbird:10010/data/cvs/webgui -C SAP -r cvs -k SAP\n>>\n>> edited .git/config:\n>> [cvsimport]\n>> module = SAP\n>> r = cvs\n>> d = :pserver:user@blackbird:10010/data/cvs/webgui\n>>\n>> did some commits to CVS and created a new tag\n>>\n>> Then ran:\n>> git cvsimport -ak\n>> To synchronize with CVS.\n>>\n>> The new commits were imported, but the new tag wasn't.\n\nAS> cvsimport never reconsiders changesets that were already imported, so if\nAS> the tag was added to such a changeset it won't be seen.\n\nAS> Andreas.\n\n\nDo you mean, if I tag BEFORE cvsimport, it will be imported?\nHow to make the git repo \"forget\" the last cvsimport?\n\n-- \n"},{"id":"196458","messageId":"m2pq76vecd.fsf@igel.home","threadId":"31184","inReplyTo":"9510482012.20120804170149@gmail.com","subject":"Re: git cvsimport: new tags not imported on second cvsimport","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-08-04T15:58:26Z","receivedAt":"2012-08-04T15:58:26Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Ilya Basin writes:\n\n> AS> Ilya Basin writes:\n>\n>>> I made the initial import:\n>>> git cvsimport -d :pserver:user@blackbird:10010/data/cvs/webgui -C SAP -r cvs -k SAP\n>>>\n>>> edited .git/config:\n>>> [cvsimport]\n>>> module = SAP\n>>> r = cvs\n>>> d = :pserver:user@blackbird:10010/data/cvs/webgui\n>>>\n>>> did some commits to CVS and created a new tag\n>>>\n>>> Then ran:\n>>> git cvsimport -ak\n>>> To synchronize with CVS.\n>>>\n>>> The new commits were imported, but the new tag wasn't.\n>\n> AS> cvsimport never reconsiders changesets that were already imported, so if\n> AS> the tag was added to such a changeset it won't be seen.\n>\n> AS> Andreas.\n>\n>\n> Do you mean, if I tag BEFORE cvsimport, it will be imported?\n\nIf you tag one of the new commits it will be imported.\n\n> How to make the git repo \"forget\" the last cvsimport?\n\nReset the branch back to before the import.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"196472","messageId":"7v7gte9una.fsf@alter.siamese.dyndns.org","threadId":"31184","inReplyTo":"m2pq76vecd.fsf@igel.home","subject":"Re: git cvsimport: new tags not imported on second cvsimport","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-08-04T22:09:29Z","receivedAt":"2012-08-04T22:09:29Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andreas Schwab writes:\n\n> Reset the branch back to before the import.\n\nDoes the resulting history created by cvsimport after resetting a\nbranch back to an older point exactly match the history before\nresetting (obviously modulo the tag that has been added since the\noriginal import)?\n\nI recall that cvsimport tried hard to be reproducible and it should\nwork, but I haven't run cvsimport myself for a long time, so...\n"},{"id":"196475","messageId":"m2lihuuwnz.fsf@igel.home","threadId":"31184","inReplyTo":"7v7gte9una.fsf@alter.siamese.dyndns.org","subject":"Re: git cvsimport: new tags not imported on second cvsimport","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-08-04T22:20:16Z","receivedAt":"2012-08-04T22:20:16Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Junio C Hamano writes:\n\n> Andreas Schwab writes:\n>\n>> Reset the branch back to before the import.\n>\n> Does the resulting history created by cvsimport after resetting a\n> branch back to an older point exactly match the history before\n> resetting (obviously modulo the tag that has been added since the\n> original import)?\n\nUsually it does.\n\n> I recall that cvsimport tried hard to be reproducible and it should\n> work, but I haven't run cvsimport myself for a long time, so...\n\nAs long as cvsps detects the same changesets.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"}]}