{"thread":{"id":"3597","subject":"Some more cvsimport","startedAt":"2006-03-08T08:49:44Z","lastAt":"2006-03-11T07:00:34Z","messageCount":3,"participants":["Rajkumar S","Matthias Urlichs","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"17324","messageId":"440E9AA8.2020605@asianetindia.com","threadId":"3597","inReplyTo":null,"subject":"Some more cvsimport","fromName":"Rajkumar S","fromEmail":"rajkumars@asianetindia.com","sentAt":"2006-03-08T08:49:44Z","receivedAt":"2006-03-08T08:49:44Z","isPatch":false,"sender":{"key":"rajkumars@asianetindia.com","avatar":null},"body":"Hi all,\n\nThanks every one for replying to my previous mails and to Smurf for his helpful replies \nand patch.\n\nThe cvs project I am trying to track has 2 branchs. One head and another for releng_1. The \nupstream cvs tree gets updated on both branchs. I also make modifications to both. When I \nnormally do cvsimport, the releng_1 tree gets updated automatically, but if I have checked \nout the releng_1 branch in my local git repository when cvsimport happens the files do not \nget updated.  I can fix this by checking out the master branch just before cvsimport and \nthen switching back.\n\nI am attaching a test script to simulate the problem and the fix is commented out.\n\nraj\n"},{"id":"17451","messageId":"pan.2006.03.11.06.34.26.200002@smurf.noris.de","threadId":"3597","inReplyTo":"440E9AA8.2020605@asianetindia.com","subject":"Re: Some more cvsimport","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2006-03-11T06:34:26Z","receivedAt":"2006-03-11T06:34:26Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi, Rajkumar S wrote:\n\n> When I normally do cvsimport, the releng_1\n> tree gets updated automatically, but if I have checked out the releng_1\n> branch in my local git repository when cvsimport happens the files do not\n> get updated.\n\nDon't Do That.\n\nI just removed the \"update checked-out tree\" logic because it has too many\ncorner cases.\n\nI could conceivably add a check for HEAD pointing to the CVS branch I'm\njust checking out, but on second thought I'd rather wait for the\nrefs/remotes/ work to show up, and then simply s/heads/remotes/g. ;-)\n\n-- \nMatthias Urlichs\n"},{"id":"17453","messageId":"7vacbxxy7h.fsf@assigned-by-dhcp.cox.net","threadId":"3597","inReplyTo":"pan.2006.03.11.06.34.26.200002@smurf.noris.de","subject":"Re: Some more cvsimport","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-03-11T07:00:34Z","receivedAt":"2006-03-11T07:00:34Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthias Urlichs <smurf@smurf.noris.de> writes:\n\n> Hi, Rajkumar S wrote:\n>\n>> When I normally do cvsimport, the releng_1\n>> tree gets updated automatically, but if I have checked out the releng_1\n>> branch in my local git repository when cvsimport happens the files do not\n>> get updated.\n>\n> Don't Do That.\n\nI tend to agree with this.\n\nThink of foreign SCM imports, especially the ones that do not\nuse working tree files, just like tracking foreign branch heads\nusing \"git fetch\".  You do not fetch into the current branch,\nnor you check out and do your work tracking branch.  You use\nthem to keep track of other people's work, and if you want to\nuse it you pull that into your branch, typically but not\nnecessarily \"master\".\n"}]}