{"thread":{"id":"3374","subject":"git-cvs-import and branches","startedAt":"2006-02-17T19:55:25Z","lastAt":"2006-02-17T20:35:15Z","messageCount":2,"participants":["Martin Mares","David Mansfield"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"16335","messageId":"mj+md-20060217.193815.10412.albireo@ucw.cz","threadId":"3374","inReplyTo":null,"subject":"git-cvs-import and branches","fromName":"Martin Mares","fromEmail":"mj@ucw.cz","sentAt":"2006-02-17T19:55:25Z","receivedAt":"2006-02-17T19:55:25Z","isPatch":false,"sender":{"key":"mj@ucw.cz","avatar":null},"body":"Hello!\n\nI'm git-importing a rather large CVS repository with lots of branches and\nalthough the mainline is imported correctly, the branches aren't. They\nusually contain some changes introduced to the ancestor branch after\nthe point the new branch has been tagged.\n\nI haven't studied git-cvsimport and cvsps in much detail yet, but it seems\nthat git-cvsimport forks off the branch at the first patchset reported by\ncvsps which mentions the branch and copies the current state of the ancestor\nbranch at that time.\n\nThis doesn't seem to be correct, since many changes might have happened\nto the ancestor branch since the real branching point. However, since\ncvsps doesn't report the branching points (and they aren't exact points anyway\nsince tagging is not atomic in CVS), I don't see how to make cvsimport\nfind the right starting revision.\n\nDoes anybody have an idea how to solve this?\n\n\t\t\t\tHave a nice fortnight\n-- \nMartin `MJ' Mares   <mj@ucw.cz>   http://atrey.karlin.mff.cuni.cz/~mj/\nFaculty of Math and Physics, Charles University, Prague, Czech Rep., Earth\nCOBOL -- Completely Outdated, Badly Overused Language\n"},{"id":"16336","messageId":"1140208515.3397.177.camel@gandalf.cobite.com","threadId":"3374","inReplyTo":"mj+md-20060217.193815.10412.albireo@ucw.cz","subject":"Re: git-cvs-import and branches","fromName":"David Mansfield","fromEmail":"david@cobite.com","sentAt":"2006-02-17T20:35:15Z","receivedAt":"2006-02-17T20:35:15Z","isPatch":false,"sender":{"key":"david@cobite.com","avatar":null},"body":"On Fri, 2006-02-17 at 20:55 +0100, Martin Mares wrote:\n> Hello!\n> \n> I'm git-importing a rather large CVS repository with lots of branches and\n> although the mainline is imported correctly, the branches aren't. They\n> usually contain some changes introduced to the ancestor branch after\n> the point the new branch has been tagged.\n> \n> I haven't studied git-cvsimport and cvsps in much detail yet, but it seems\n> that git-cvsimport forks off the branch at the first patchset reported by\n> cvsps which mentions the branch and copies the current state of the ancestor\n> branch at that time.\n> \n> This doesn't seem to be correct, since many changes might have happened\n> to the ancestor branch since the real branching point. However, since\n> cvsps doesn't report the branching points (and they aren't exact points anyway\n> since tagging is not atomic in CVS), I don't see how to make cvsimport\n> find the right starting revision.\n\nUgh.  I understand the problem but really don't have any solutions\noff-hand.  Unfortunately, I dying under a 'real work' load at the\nmoment, so I have to apologize and say, 'good luck.'\n\n\nDavid\n"}]}