{"thread":{"id":"34411","subject":"merging commit history","startedAt":"2013-07-11T23:43:56Z","lastAt":"2013-07-17T01:08:18Z","messageCount":3,"participants":["Stephen & Linda Smith","Andrew Ardill"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"223119","messageId":"3186432.VaN86YJOtL@thunderbird","threadId":"34411","inReplyTo":null,"subject":"merging commit history","fromName":"Stephen & Linda Smith","fromEmail":"ischis2@cox.net","sentAt":"2013-07-11T23:43:56Z","receivedAt":"2013-07-11T23:43:56Z","isPatch":false,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"I'm working on a project that used to use a proprietary CM system (aka oldCM).   At a point in time, the state of the code was frozen and used as the basis for commits in SVN.\n\nWhat I would like to to do is take the individal commits from the oldCM and place them into git knowing that the time/date stamps won't match.  Then I want to do whatever is necessary to\nsetup git so that I can run \"svn rebase\" to pull in the commits from the SVN repository.\n\nWhat is the easy way to do this?\n"},{"id":"223120","messageId":"CAH5451njL_AQqi0pHMsUvW9iC69Y8sEEwgHr9iCA9FoG=a8E_A@mail.gmail.com","threadId":"34411","inReplyTo":"3186432.VaN86YJOtL@thunderbird","subject":"Re: merging commit history","fromName":"Andrew Ardill","fromEmail":"andrew.ardill@gmail.com","sentAt":"2013-07-12T00:11:41Z","receivedAt":"2013-07-12T00:11:41Z","isPatch":false,"sender":{"key":"andrew.ardill@gmail.com","avatar":"https://gravatar.com/avatar/da14cb7c091dd44dc6c63a4d3361b149acaf25226dc78eb4131a17b93d9b0993?d=mp&s=160"},"body":"On 12 July 2013 09:43, Stephen & Linda Smith <ischis2@cox.net> wrote:\n> I'm working on a project that used to use a proprietary CM system (aka oldCM).   At a point in time, the state of the code was frozen and used as the basis for commits in SVN.\n>\n> What I would like to to do is take the individal commits from the oldCM and place them into git knowing that the time/date stamps won't match.  Then I want to do whatever is necessary to\n> setup git so that I can run \"svn rebase\" to pull in the commits from the SVN repository.\n>\n> What is the easy way to do this?\n\n\nThere may be other tools that make this easier, but if I had this\nproblem I would simply create two repositories, one for oldCM and one\nfor SVN. I would then merge the two together (as branches with\ndifferent roots) and do my rebase from there.\n\nI haven't tried this, and maybe there is something I am missing, but\nthere shouldn't be too much pain going that way.\n\n\nRegards,\n\nAndrew Ardill\n"},{"id":"223559","messageId":"2783346.mfr0aMU5vx@thunderbird","threadId":"34411","inReplyTo":"3186432.VaN86YJOtL@thunderbird","subject":"Re: merging commit history","fromName":"Stephen & Linda Smith","fromEmail":"ischis2@cox.net","sentAt":"2013-07-17T01:08:18Z","receivedAt":"2013-07-17T01:08:18Z","isPatch":false,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"I did as Andrew suggested and created two git repositories  with one  branch using oldCM history and the second branch using having the svn history.  \n\nThen I checked out the svn branch and rebased onto oldCM.   The head of the combined branch is named master.\n\nHow do I manually set git/git-svn up so that HEAD  points to -r rev  in the svn repository?    Googling doesn't come up with a solution; I previously thought google knows all.\n\nWhen done, I would like git svn dcommit to be able to commit to the svn repo.\n\nThanks\nsps\n\nOn Friday, July 12, 2013 10:11:41 AM Andrew Ardill wrote:\n> On 12 July 2013 09:43, Stephen & Linda Smith <ischis2@cox.net> wrote:\n> > I'm working on a project that used to use a proprietary CM system (aka oldCM).   At a point in time, the state of the code was frozen and used as the basis for commits in SVN.\n> >\n> > What I would like to to do is take the individal commits from the oldCM and place them into git knowing that the time/date stamps won't match.  Then I want to do whatever is necessary to\n> > setup git so that I can run \"svn rebase\" to pull in the commits from the SVN repository.\n> >\n> > What is the easy way to do this?\n> \n> \n> There may be other tools that make this easier, but if I had this\n> problem I would simply create two repositories, one for oldCM and one\n> for SVN. I would then merge the two together (as branches with\n> different roots) and do my rebase from there.\n> \n> I haven't tried this, and maybe there is something I am missing, but\n> there shouldn't be too much pain going that way.\n> \n> \n> Regards,\n> \n> Andrew Ardill\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n"}]}