{"thread":{"id":"23176","subject":"Help with rebase after cvsimport","startedAt":"2010-03-25T17:37:50Z","lastAt":"2010-03-27T17:22:29Z","messageCount":3,"participants":["Brice Ruth","Michael J Gruber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"137802","messageId":"bcd06dea1003251037j492bfbbcx2f99ad5046169f2@mail.gmail.com","threadId":"23176","inReplyTo":"bcd06dea1003250935q324b2412g959309070491c73c@mail.gmail.com","subject":"Help with rebase after cvsimport","fromName":"Brice Ruth","fromEmail":"bdruth@gmail.com","sentAt":"2010-03-25T17:37:50Z","receivedAt":"2010-03-25T17:37:50Z","isPatch":false,"sender":{"key":"bdruth@gmail.com","avatar":null},"body":"Posted this to #git but it seemed like everyone was asleep (or clueless)\n\n[11:22] <Brice> Good morning - I have a quick question on using git\nrebase with git cvsimport - I'm trying to eliminate the duplicate 'cvs\nimport' commit created when the cvs import is merged in - I'm just not\nsure what 'rebase' I need to do after a git cvsimport. Help?\n[11:22] <Brice> I'm on master when I do cvsimport\n[11:23] <Brice> cvsimport is run with -r cvs\n[11:23] <Brice> so, am I in the right ballpark thinking I need to git\nrebase cvs?\n\nAny help would be appreciated!\n\nThanks,\n\nBrice Ruth, FCD\nSoftware Engineer, Madison WI\n"},{"id":"137834","messageId":"4BAC7BAC.7030507@drmicha.warpmail.net","threadId":"23176","inReplyTo":"bcd06dea1003251037j492bfbbcx2f99ad5046169f2@mail.gmail.com","subject":"Re: Help with rebase after cvsimport","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-03-26T09:17:32Z","receivedAt":"2010-03-26T09:17:32Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Brice Ruth venit, vidit, dixit 25.03.2010 18:37:\n> Posted this to #git but it seemed like everyone was asleep (or clueless)\n> \n> [11:22] <Brice> Good morning - I have a quick question on using git\n> rebase with git cvsimport - I'm trying to eliminate the duplicate 'cvs\n> import' commit created when the cvs import is merged in - I'm just not\n> sure what 'rebase' I need to do after a git cvsimport. Help?\n> [11:22] <Brice> I'm on master when I do cvsimport\n> [11:23] <Brice> cvsimport is run with -r cvs\n> [11:23] <Brice> so, am I in the right ballpark thinking I need to git\n> rebase cvs?\n\nYou have basically 2 options, see, e.g., the last paragraphs of\n\nhttp://grubix.blogspot.com/2009/11/git-over-cvs.html\n\nIt seems you want to go with 1. In that case you need to\n\ngit rebase cvs/master master\n\n(you can leave out the second argument if you are on master). Note that\nby doing that you basically discard your version of commits which made\nthe git-cvs-git roundtrip (committed in git, cvsexported to cvs,\ncvsimported to git). That's why I use approach 2 mentioned there, but it\ndepends certainly on your usage scenario, whether cvs is the\ncentral/authoritative repo on which you work with git, or the other way\nround.\n\nCheers,\nMichael\n"},{"id":"137955","messageId":"4BAE3ED5.6080808@drmicha.warpmail.net","threadId":"23176","inReplyTo":"bcd06dea1003260910h6e27fdfbh9f968bf5ca4c1b6e@mail.gmail.com","subject":"Re: Help with rebase after cvsimport","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-03-27T17:22:29Z","receivedAt":"2010-03-27T17:22:29Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Brice Ruth venit, vidit, dixit 26.03.2010 17:10:\n> So, when you write \"Note that by doing that you basically discard your\n> version of commits which made the git-cvs-git roundtrip\" - I will lose\n> the individual commits I made locally and I'll just see the *one*\n> exportcommit that I made for my local changes, is that right?\n\nThe way I use git-cvs, I have one cvs commit per git commit. Are you\nusing it differently?\n\nThe rebase will discard those commits whose patch text is already\n\"present\" on the branch. I assume that for a cumulative patch this means\nit's not ignored - in that case the rebase won't buy you anything.\n\nMichael\n"}]}