Re: merging commit history

2013-07-16 Thread Stephen & Linda Smith
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. Then I checked out the svn branch and rebased onto oldCM. The head of the combined branch is named master. How do I manually set git/git-svn u

Re: merging commit history

2013-07-11 Thread Andrew Ardill
On 12 July 2013 09:43, Stephen & Linda Smith wrote: > 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. > > What I would like to to do is take the individal commits f

merging commit history

2013-07-11 Thread Stephen & Linda Smith
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. What I would like to to do is take the individal commits from the oldCM and place them into git knowing that the time/d