{"thread":{"id":"11801","subject":"Problem with cvsimport","startedAt":"2008-01-30T10:53:08Z","lastAt":"2008-01-30T10:53:08Z","messageCount":1,"participants":["picca"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"66912","messageId":"20080130115308.760d6e20@synchrotron-soleil.Fr","threadId":"11801","inReplyTo":null,"subject":"Problem with cvsimport","fromName":"picca","fromEmail":"picca@synchrotron-soleil.fr","sentAt":"2008-01-30T10:53:08Z","receivedAt":"2008-01-30T10:53:08Z","isPatch":false,"sender":{"key":"picca@synchrotron-soleil.fr","avatar":null},"body":"Hello\n\n\nWhen I try to import a project into git with the cvsimport tool, it\nworks fine most of the time. I obtain a clean repository without all\nthoses CVS directories.\n\nBut sometimes during the import the cvs server hang and i need to do\nCtrl+C the restart the command.\ncvsimport skip the already downloaded patchset but at the end I obtain\nthis message\n\n---\nGenerating pack...\nDone counting 1534 objects.\nDeltifying 1534 objects...\n 100% (1534/1534) done\nWriting 1534 objects...\n 100% (1534/1534) done\nTotal 1534 (delta 1160), reused 0 (delta 0)\nPack pack-8fb4f1c25c831ba29c7bd53989cb1b445b60bc07 created.\nRemoving unused objects 100%...\nDone.\nDONE.\nfatal: Needed a single revision\nCan merge only exactly one commit into empty head\nCould not merge origin into the current branch.\n---\n\nSo to resume:\n* In one shoot no problem at the end cvsimport checkout the\nright head.\n* multiple shoot impossible to merge origin into the current branch.\n\nHow this problem can be solved ?\n\nThanks\n\nFrederic\n"}]}