{"thread":{"id":"9228","subject":"problem after cvsimport","startedAt":"2007-07-26T01:49:13Z","lastAt":"2007-07-26T07:18:08Z","messageCount":5,"participants":["Bert Douglas","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"48618","messageId":"46A7FD99.9000305@tplogic.com","threadId":"9228","inReplyTo":null,"subject":"problem after cvsimport","fromName":"Bert Douglas","fromEmail":"bertd@tplogic.com","sentAt":"2007-07-26T01:49:13Z","receivedAt":"2007-07-26T01:49:13Z","isPatch":false,"sender":{"key":"bertd@tplogic.com","avatar":null},"body":"I am new to git, so probably doing something wrong.\nHope somebody can enlighten me.\nHere is what happened so far.\n\nFollowed instructions here:\nhttp://www.kernel.org/pub/software/scm/git/docs/cvs-migration.html\n\nDid command like this:\n\n$ git cvsimport -C <destination> <module>\n\nThis was done from top level of existing cvs working directory.\nDestination was new empty directory, outside the cvs tree.\n\nIt worked for several hours and seemed to complete ok.\nI can look at history in destination git directory with gitk and git log.\nAll the stuff in \".git\" looks normal, as far as I can tell.\n\nBut I have no files in the working directory.\nWhen I do command:\n$git checkout master\n\nI get a bunch of lines to console with \"D\" in front.\nBtw, what does that mean?  Nothing about it in \"man git-checkout\" or elsewhere that I can find.\nThen it says -- Already on branch \"master\"\n\nBut working directory is still empty.\n\n\nThanks much,\nBert Douglas\n"},{"id":"48623","messageId":"7vlkd3c16z.fsf@assigned-by-dhcp.cox.net","threadId":"9228","inReplyTo":"46A7FD99.9000305@tplogic.com","subject":"Re: problem after cvsimport","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-07-26T03:07:32Z","receivedAt":"2007-07-26T03:07:32Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Bert Douglas <bertd@tplogic.com> writes:\n\n> I am new to git, so probably doing something wrong.\n> Hope somebody can enlighten me.\n> Here is what happened so far.\n>\n> Followed instructions here:\n> http://www.kernel.org/pub/software/scm/git/docs/cvs-migration.html\n>\n> Did command like this:\n>\n> $ git cvsimport -C <destination> <module>\n>\n> This was done from top level of existing cvs working directory.\n> Destination was new empty directory, outside the cvs tree.\n>\n> It worked for several hours and seemed to complete ok.\n> I can look at history in destination git directory with gitk and git log.\n> All the stuff in \".git\" looks normal, as far as I can tell.\n>\n> But I have no files in the working directory.\n> When I do command:\n> $git checkout master\n>\n> I get a bunch of lines to console with \"D\" in front.\n> Btw, what does that mean?  Nothing about it in \"man git-checkout\" or elsewhere that I can find.\n> Then it says -- Already on branch \"master\"\n>\n> But working directory is still empty.\n\nHave you tried \"git checkout -f\" after that?  With recent enough\ngit, \"git cvsimport -C <destination> <module>\" from the top\nlevel of existing cvs working directory, with nonexistent\ndestination directory (that is, you let \"git cvsimport -C\" to\ncreate that destination directory) would run \"git checkout -f\"\nfor you.\n"},{"id":"48663","messageId":"46A8459C.7030202@tplogic.com","threadId":"9228","inReplyTo":"7vlkd3c16z.fsf@assigned-by-dhcp.cox.net","subject":"Re: problem after cvsimport","fromName":"Bert Douglas","fromEmail":"bertd@tplogic.com","sentAt":"2007-07-26T06:56:28Z","receivedAt":"2007-07-26T06:56:28Z","isPatch":false,"sender":{"key":"bertd@tplogic.com","avatar":null},"body":"Junio C Hamano wrote:\n> Bert Douglas <bertd@tplogic.com> writes:\n>\n>   \n>> I am new to git, so probably doing something wrong.\n>> Hope somebody can enlighten me.\n>> Here is what happened so far.\n>>\n>> Followed instructions here:\n>> http://www.kernel.org/pub/software/scm/git/docs/cvs-migration.html\n>>\n>> Did command like this:\n>>\n>> $ git cvsimport -C <destination> <module>\n>>\n>> This was done from top level of existing cvs working directory.\n>> Destination was new empty directory, outside the cvs tree.\n>>\n>> It worked for several hours and seemed to complete ok.\n>> I can look at history in destination git directory with gitk and git log.\n>> All the stuff in \".git\" looks normal, as far as I can tell.\n>>\n>> But I have no files in the working directory.\n>> When I do command:\n>> $git checkout master\n>>\n>> I get a bunch of lines to console with \"D\" in front.\n>> Btw, what does that mean?  Nothing about it in \"man git-checkout\" or elsewhere that I can find.\n>> Then it says -- Already on branch \"master\"\n>>\n>> But working directory is still empty.\n>>     \n>\n> Have you tried \"git checkout -f\" after that?  With recent enough\n> git, \"git cvsimport -C <destination> <module>\" from the top\n> level of existing cvs working directory, with nonexistent\n> destination directory (that is, you let \"git cvsimport -C\" to\n> create that destination directory) would run \"git checkout -f\"\n> for you.\n>   \nSomehow I missed that option.\nThat worked.  Very fast.  Thanks.\n\nAm I going to have to do \"-f\" a lot?\nHow will I know when to do it?\nWhy not do it all the time?\n"},{"id":"48666","messageId":"7vsl7b8x5w.fsf@assigned-by-dhcp.cox.net","threadId":"9228","inReplyTo":"46A8459C.7030202@tplogic.com","subject":"Re: problem after cvsimport","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-07-26T07:02:51Z","receivedAt":"2007-07-26T07:02:51Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Bert Douglas <bertd@tplogic.com> writes:\n\n> Am I going to have to do \"-f\" a lot?\n> How will I know when to do it?\n> Why not do it all the time?\n\nWith recent enough git, you shouldn't even have to do that extra\n\"git checkout\".  It was noticed and fixed quite a while ago.\n"},{"id":"48672","messageId":"46A84AB0.8000703@tplogic.com","threadId":"9228","inReplyTo":"7vsl7b8x5w.fsf@assigned-by-dhcp.cox.net","subject":"Re: problem after cvsimport","fromName":"Bert Douglas","fromEmail":"bertd@tplogic.com","sentAt":"2007-07-26T07:18:08Z","receivedAt":"2007-07-26T07:18:08Z","isPatch":false,"sender":{"key":"bertd@tplogic.com","avatar":null},"body":"Junio C Hamano wrote:\n> Bert Douglas <bertd@tplogic.com> writes:\n>\n>   \n>> Am I going to have to do \"-f\" a lot?\n>> How will I know when to do it?\n>> Why not do it all the time?\n>>     \n>\n> With recent enough git, you shouldn't even have to do that extra\n> \"git checkout\".  It was noticed and fixed quite a while ago.\n>\n>   \nThanks much.\n\n$ git --version\ngit version 1.5.2.4\n\nBut I guess my basic question remains in two parts.\n(1) Will it 'get out of sync' again sometime ?\n(2) Will anything bad happen if I always do 'checkout -f' ?\n"}]}