{"thread":{"id":"16137","subject":"git-cvsimport BUG: some commits are completely out of phase (but cvsps sees them all right)","startedAt":"2008-11-02T21:03:40Z","lastAt":"2008-11-03T19:40:49Z","messageCount":7,"participants":["Francis Galiegue","Tomi Pakarinen","Michael Haggerty","Samuel Lucas Vaz de Mello","Shawn O. Pearce"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"94690","messageId":"200811022203.41092.fg@one2team.net","threadId":"16137","inReplyTo":null,"subject":"git-cvsimport BUG: some commits are completely out of phase (but cvsps sees them all right)","fromName":"Francis Galiegue","fromEmail":"fg@one2team.net","sentAt":"2008-11-02T21:03:40Z","receivedAt":"2008-11-02T21:03:40Z","isPatch":false,"sender":{"key":"fg@one2team.net","avatar":null},"body":"Maybe it's due to the other bug that I reported with git-cvsimport a few days \nago: namely, it does NOT see branches created by CVS with no commits in them \n(ie, create the branch and that's it, don't touch anything).\n\nThe problem is very serious, since it seems to trigger another bug which \nprevents git-cvsimport from working at all. cvsps DOES see the commit \ncorrectly (branc exists for this file at 1.47.6):\n\n---\nMembers:\n \nsrc/java/com/one2team/database/bean/impl/relation/reporting/Register.java:1.47->1.47.6.1\n---\n\nBut on the imported git repository, the diff is rather 1.60 -> 1.47.6.1! As a \nresult, the repository is plain unusable.\n\nAs to the first problem, git finds 6 branches, cvs log finds 8 for the same \nmodule. git finds 22 tags, cvs log finds 29!\n\n-- \nfge\n"},{"id":"94697","messageId":"f299b4f30811021421w2ef43792l7514ab3a0506077a@mail.gmail.com","threadId":"16137","inReplyTo":"200811022203.41092.fg@one2team.net","subject":"Re: git-cvsimport BUG: some commits are completely out of phase (but cvsps sees them all right)","fromName":"Tomi Pakarinen","fromEmail":"tomi.pakarinen@gmail.com","sentAt":"2008-11-02T22:21:44Z","receivedAt":"2008-11-02T22:21:44Z","isPatch":false,"sender":{"key":"tomi.pakarinen@gmail.com","avatar":null},"body":"CVS's branch does not appear on cvsps's output, until you do a commit\nto it. git-cvsimport\nrelies on cvsps and can not do much about this...\n\nLast problem may arise, if you try to do incremental imports from cvs to git.\nFor incremental imports you must start import from same location in\ncvs each time.\nIf you have made first import from beginning of history, sequent\nimports must start\nfrom there too. Otherwise cvsps will renumber patch sets.\n\n Tomi.\n\n\n\nOn Sun, Nov 2, 2008 at 11:03 PM, Francis Galiegue wrote:\n> Maybe it's due to the other bug that I reported with git-cvsimport a few days\n> ago: namely, it does NOT see branches created by CVS with no commits in them\n> (ie, create the branch and that's it, don't touch anything).\n>\n> The problem is very serious, since it seems to trigger another bug which\n> prevents git-cvsimport from working at all. cvsps DOES see the commit\n> correctly (branc exists for this file at 1.47.6):\n>\n> ---\n> Members:\n>\n> src/java/com/one2team/database/bean/impl/relation/reporting/Register.java:1.47->1.47.6.1\n> ---\n>\n> But on the imported git repository, the diff is rather 1.60 -> 1.47.6.1! As a\n> result, the repository is plain unusable.\n>\n> As to the first problem, git finds 6 branches, cvs log finds 8 for the same\n> module. git finds 22 tags, cvs log finds 29!\n>\n> --\n> fge\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n>\n"},{"id":"94699","messageId":"200811022331.14048.fg@one2team.net","threadId":"16137","inReplyTo":"f299b4f30811021421w2ef43792l7514ab3a0506077a@mail.gmail.com","subject":"Re: git-cvsimport BUG: some commits are completely out of phase (but cvsps sees them all right)","fromName":"Francis Galiegue","fromEmail":"fg@one2team.net","sentAt":"2008-11-02T22:31:13Z","receivedAt":"2008-11-02T22:31:13Z","isPatch":false,"sender":{"key":"fg@one2team.net","avatar":null},"body":"Le Sunday 02 November 2008 23:21:44 Tomi Pakarinen, vous avez écrit :\n> CVS's branch does not appear on cvsps's output, until you do a commit\n> to it. git-cvsimport\n> relies on cvsps and can not do much about this...\n>\n\nWell, there's another file that cvsps generate (in $HOME/.cvsps) that helps \nhere and that is named \":::#path#to#cvsroot#modulename.\" \nThis file contains the needed information. As far as I can see though, \ngit-cvsimport does not use it.\n\n\n> Last problem may arise, if you try to do incremental imports from cvs to\n> git. For incremental imports you must start import from same location in\n> cvs each time.\n> If you have made first import from beginning of history, sequent\n> imports must start\n> from there too. Otherwise cvsps will renumber patch sets.\n>\n\nThe plan would be to convert all modules in one go, with no one committing in \nthe meantime, so that's not a problem.\n\nI'll try and dig a little deeper into git-cvsimport and see if I can make it \nuse this information...\n\n-- \nfge\n"},{"id":"94765","messageId":"490F1021.1090002@alum.mit.edu","threadId":"16137","inReplyTo":"200811022331.14048.fg@one2team.net","subject":"Re: git-cvsimport BUG: some commits are completely out of phase (but cvsps sees them all right)","fromName":"Michael Haggerty","fromEmail":"mhagger@alum.mit.edu","sentAt":"2008-11-03T14:52:17Z","receivedAt":"2008-11-03T14:52:17Z","isPatch":false,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"Francis Galiegue wrote:\n> The plan would be to convert all modules in one go, with no one committing in \n> the meantime, so that's not a problem.\n\nThen you should definitely try cvs2svn/cvs2git [1]. cvsps-based\nconversion tools all have known and unavoidable problems due to the\nlimitations of cvsps.\n\nMichael\n(the cvs2svn/cvs2git maintainer)\n\n[1] http://cvs2svn.tigris.org/cvs2git.html\n"},{"id":"94796","messageId":"490F4B1E.2080707@datacom.ind.br","threadId":"16137","inReplyTo":"490F1021.1090002@alum.mit.edu","subject":"Re: git-cvsimport BUG: some commits are completely out of phase (but cvsps sees them all right)","fromName":"Samuel Lucas Vaz de Mello","fromEmail":"samuellucas@datacom.ind.br","sentAt":"2008-11-03T19:03:58Z","receivedAt":"2008-11-03T19:03:58Z","isPatch":false,"sender":{"key":"samuellucas@datacom.ind.br","avatar":null},"body":"Michael Haggerty wrote:\n> Francis Galiegue wrote:\n>> The plan would be to convert all modules in one go, with no one committing in \n>> the meantime, so that's not a problem.\n> \n> Then you should definitely try cvs2svn/cvs2git [1]. cvsps-based\n> conversion tools all have known and unavoidable problems due to the\n> limitations of cvsps.\n> \n\nMichael,\n\nDoes cvs2git plans to support incremental importing?\n\n - Samuel\n"},{"id":"94797","messageId":"20081103190853.GM15463@spearce.org","threadId":"16137","inReplyTo":"490F4B1E.2080707@datacom.ind.br","subject":"Re: git-cvsimport BUG: some commits are completely out of phase (but cvsps sees them all right)","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-11-03T19:08:53Z","receivedAt":"2008-11-03T19:08:53Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Samuel Lucas Vaz de Mello wrote:\n> Michael Haggerty wrote:\n> > Francis Galiegue wrote:\n> >> The plan would be to convert all modules in one go, with no one committing in \n> >> the meantime, so that's not a problem.\n> > \n> > Then you should definitely try cvs2svn/cvs2git [1]. cvsps-based\n> > conversion tools all have known and unavoidable problems due to the\n> > limitations of cvsps.\n> \n> Does cvs2git plans to support incremental importing?\n\nNo, it doesn't, and likely never will. Computing the\nchange sets from CVS is ugly and more-or-less requires\nthat you do it all in one pass.\n\n-- \nShawn.\n"},{"id":"94801","messageId":"490F53C1.6080705@alum.mit.edu","threadId":"16137","inReplyTo":"490F4B1E.2080707@datacom.ind.br","subject":"Re: git-cvsimport BUG: some commits are completely out of phase (but cvsps sees them all right)","fromName":"Michael Haggerty","fromEmail":"mhagger@alum.mit.edu","sentAt":"2008-11-03T19:40:49Z","receivedAt":"2008-11-03T19:40:49Z","isPatch":false,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"Samuel Lucas Vaz de Mello wrote:\n> Michael Haggerty wrote:\n>> Francis Galiegue wrote:\n>>> The plan would be to convert all modules in one go, with no one committing in \n>>> the meantime, so that's not a problem.\n>> Then you should definitely try cvs2svn/cvs2git [1]. cvsps-based\n>> conversion tools all have known and unavoidable problems due to the\n>> limitations of cvsps.\n> \n> Does cvs2git plans to support incremental importing?\n\nNope. It would be very difficult to get it right, and I've pretty much\nrun out of hacking time with the birth of my second child. But I'd be\nhappy to help any volunteers get started :-)\n\nMichael\n"}]}