{"thread":{"id":"1267","subject":"\"git cvsimport\" with branches?","startedAt":"2005-07-17T08:40:53Z","lastAt":"2005-07-17T18:02:48Z","messageCount":7,"participants":["Wolfgang Denk","Alexey Nezhdanov","Matthias Urlichs"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"6213","messageId":"20050717084053.94D603525D1@atlas.denx.de","threadId":"1267","inReplyTo":null,"subject":"\"git cvsimport\" with branches?","fromName":"Wolfgang Denk","fromEmail":"wd@denx.de","sentAt":"2005-07-17T08:40:53Z","receivedAt":"2005-07-17T08:40:53Z","isPatch":false,"sender":{"key":"wd@denx.de","avatar":null},"body":"Is there a way to make \"git cvsimport\" create branches in git for any\nbranches it encounters in the CVS repository?\n\nAll my imports so far show just a linear line of development, and CVS\nbranch information seems lost.\n\nBest regards,\n\nWolfgang Denk\n\n-- \nSoftware Engineering: Embedded and Realtime Systems, Embedded Linux\nPhone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de\nLittle known fact about Middle Earth: The Hobbits had a very sophi-\nsticated computer network! It was a Tolkien Ring...\n"},{"id":"6215","messageId":"200507171257.59384.snake@penza-gsm.ru","threadId":"1267","inReplyTo":"20050717084053.94D603525D1@atlas.denx.de","subject":"Re: \"git cvsimport\" with branches?","fromName":"Alexey Nezhdanov","fromEmail":"snake@penza-gsm.ru","sentAt":"2005-07-17T08:57:59Z","receivedAt":"2005-07-17T08:57:59Z","isPatch":false,"sender":{"key":"snake@penza-gsm.ru","avatar":null},"body":"В сообщении от Воскресенье 17 Июль 2005 12:40 Wolfgang Denk написал(a):\n> Is there a way to make \"git cvsimport\" create branches in git for any\n> branches it encounters in the CVS repository?\nHeh. I was just preparing mail about the same problem.\nIt seems that git-cvsimport-script really don't likes branches in CVS.\nI have attached simple script that demonstrates this.\nOn my machine it gives:\n=============================\nsnake@home2:/tmp$ ./testscript\ncvs checkout: Updating project\ncvs add: scheduling file `a' for addition\ncvs add: use `cvs commit' to add this file permanently\n/tmp/20050717125452/cvsroot/project/a,v <-- a\ninitial revision: 1.1\ncvs tag: Tagging .\nT a\n/tmp/20050717125452/cvsroot/project/a,v <-- a\nnew revision: 1.2; previous revision: 1.1\ncvs update: Updating .\nU a\n/tmp/20050717125452/cvsroot/project/a,v <-- a\nnew revision: 1.1.2.1; previous revision: 1.1\ncvs rlog: Logging project\nNew a: 2 bytes.\nTree ID 2ce1eef76631e82282e0f7f0cf9e6f3e9a4a0b1e\nCommitted patch 1 (origin)\nCommitting initial tree 2ce1eef76631e82282e0f7f0cf9e6f3e9a4a0b1e\nCommit ID f7030e1c361f94b8847ef6ad88248a675c7ce5a9\nUpdate a: 4 bytes.\nTree ID 9d3d025fff2e43c6a7b837056632b436c8e31dfe\nParent ID f7030e1c361f94b8847ef6ad88248a675c7ce5a9\nCommitted patch 2 (origin)\nCommit ID 67889434ca9623ad91f8e81e6143fed9c4115a86\nSwitching from origin to branch1\nusage: git-read-tree ( | -m [-u] [ []])\nread-tree failed: 256\nsnake@home2:/tmp$\n=============================\nIs it a planned behaivoir or cvsimport script were just recently broken?\n\n-- \nRespectfully\nAlexey Nezhdanov\n\n\n#!/bin/sh\ndirname=`date +\"%Y%m%d%H%M%S\"`\nmkdir /tmp/$dirname\ncd /tmp/$dirname\nmkdir cvsroot\ndeclare -x CVSROOT=/tmp/$dirname/cvsroot\ncvs init\nmkdir cvsroot/project\ncvs co project\ncd project\necho 1 >a\ncvs add a\ncvs ci -m 1 a\ncvs tag -b branch1\necho 2 >>a\ncvs ci -m 2 a\ncvs update -r branch1\necho 3 >>a\ncvs ci -m 3 a\ngit-cvsimport-script -v\n"},{"id":"6216","messageId":"pan.2005.07.17.09.37.58.463540@smurf.noris.de","threadId":"1267","inReplyTo":"20050717084053.94D603525D1@atlas.denx.de","subject":"Re: \"git cvsimport\" with branches?","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-07-17T09:37:59Z","receivedAt":"2005-07-17T09:37:59Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi, Wolfgang Denk wrote:\n\n> Is there a way to make \"git cvsimport\" create branches in git for any\n> branches it encounters in the CVS repository?\n> \nThat's what it does.\n\n> All my imports so far show just a linear line of development, and CVS\n> branch information seems lost.\n\nUmm, exactly what did you do to visualize that? \"gitk origin\" obvioously\nshows only one branch, because CVS doesn't have merge infe. Use\n\"gitk $(cat .git/revs/heads/*)\" to show everything.\n\n-- \nMatthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\n\"Any body of men who believe in hell will\n persecute whenever they have the power.\"\n [Joseph McCabe, \"What Gods Cost Men\"]\n"},{"id":"6217","messageId":"20050717101559.579C93525D1@atlas.denx.de","threadId":"1267","inReplyTo":"pan.2005.07.17.09.37.58.463540@smurf.noris.de","subject":"Re: \"git cvsimport\" with branches?","fromName":"Wolfgang Denk","fromEmail":"wd@denx.de","sentAt":"2005-07-17T10:15:59Z","receivedAt":"2005-07-17T10:15:59Z","isPatch":false,"sender":{"key":"wd@denx.de","avatar":null},"body":"In message you wrote:\n>\n> > All my imports so far show just a linear line of development, and CVS\n> > branch information seems lost.\n> \n> Umm, exactly what did you do to visualize that? \"gitk origin\" obvioously\n> shows only one branch, because CVS doesn't have merge infe. Use\n> \"gitk $(cat .git/revs/heads/*)\" to show everything.\n\ns/v/f/\n\nI see. Thanks for pointing out. Umm... is there a way to manually\nadjust this later? I can identify the specific PatchSet(s) which\nmerge my CVS branches back into the trunk.\n\nBest regards,\n\nWolfgang Denk\n\n-- \nSoftware Engineering: Embedded and Realtime Systems, Embedded Linux\nPhone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de\nEither one of us, by himself, is expendable. Both of us are not.\n\t-- Kirk, \"The Devil in the Dark\", stardate 3196.1\n"},{"id":"6219","messageId":"200507171448.09049.snake@penza-gsm.ru","threadId":"1267","inReplyTo":"pan.2005.07.17.09.37.58.463540@smurf.noris.de","subject":"Re: \"git cvsimport\" with branches?","fromName":"Alexey Nezhdanov","fromEmail":"snake@penza-gsm.ru","sentAt":"2005-07-17T10:48:08Z","receivedAt":"2005-07-17T10:48:08Z","isPatch":false,"sender":{"key":"snake@penza-gsm.ru","avatar":null},"body":"Sunday, 17 July 2005 13:37 Matthias Urlichs wrote:\n> Hi, Wolfgang Denk wrote:\n> > Is there a way to make \"git cvsimport\" create branches in git for any\n> > branches it encounters in the CVS repository?\n>\n> That's what it does.\nBut it does not, at least in some cases.\nSee my previous mail:\nhttp://marc.theaimsgroup.com/?l=git&m=112159075029007&w=2\nIt have simple script attached that reproduces the problem.\n\n-- \nRespectfully\nAlexey Nezhdanov\n"},{"id":"6220","messageId":"200507171633.17667.snake@penza-gsm.ru","threadId":"1267","inReplyTo":"200507171448.09049.snake@penza-gsm.ru","subject":"Re: \"git cvsimport\" with branches?","fromName":"Alexey Nezhdanov","fromEmail":"snake@penza-gsm.ru","sentAt":"2005-07-17T12:33:17Z","receivedAt":"2005-07-17T12:33:17Z","isPatch":false,"sender":{"key":"snake@penza-gsm.ru","avatar":null},"body":"Sunday, 17 July 2005 14:48 Alexey Nezhdanov wrote:\n> Sunday, 17 July 2005 13:37 Matthias Urlichs wrote:\n> > Hi, Wolfgang Denk wrote:\n> > > Is there a way to make \"git cvsimport\" create branches in git for any\n> > > branches it encounters in the CVS repository?\n> >\n> > That's what it does.\n>\n> But it does not, at least in some cases.\n> See my previous mail:\n> http://marc.theaimsgroup.com/?l=git&m=112159075029007&w=2\n> It have simple script attached that reproduces the problem.\nOuch. It was all me. I have lost -A flag.\nSorry for noise. \n\n-- \nRespectfully\nAlexey Nezhdanov\n"},{"id":"6221","messageId":"200507172202.48642.snake@penza-gsm.ru","threadId":"1267","inReplyTo":"200507171633.17667.snake@penza-gsm.ru","subject":"[offtopic]Re: \"git cvsimport\" with branches?","fromName":"Alexey Nezhdanov","fromEmail":"snake@penza-gsm.ru","sentAt":"2005-07-17T18:02:48Z","receivedAt":"2005-07-17T18:02:48Z","isPatch":false,"sender":{"key":"snake@penza-gsm.ru","avatar":null},"body":"Sorry for noise again.\nI have found two bugs in cvsps that results in the wrong import to git.\nI tried to contact developer but it seems that his mail have no mailserver \nATM. Since he has made some changes for git already - probably someone on \nthis list have his new contact. Please tell me it or forward my mail to him. \nThanks.\n\nFor the curious, here are the bugs:\n1) some branches fork off too late - cvsps shifts brahches starts forward to \nthe future\nExample:\nhttp://www.penza-gsm.ru/snake/testscript\n\n2) some branches are not detected at all, not recorded as patchsets and \nconsequently not imported into git.\nExample (branch \"old\"):\nhttp://www.penza-gsm.ru/snake/simplexml.py,v\n\n\n-- \nRespectfully\nAlexey Nezhdanov\n"}]}