Re: merging commit history

From: Andrew Ardill <andrew.ardill@gmail.com>
Date: Jul 12, 2013, 00:11 UTC
Message-ID: <CAH5451njL_AQqi0pHMsUvW9iC69Y8sEEwgHr9iCA9FoG=a8E_A@mail.gmail.com>
In-Reply-To: <3186432.VaN86YJOtL@thunderbird>

On 12 July 2013 09:43, Stephen & Linda Smith <ischis2@cox.net> wrote:

Show 6 quoted lines

> 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/date stamps won't match.  Then I want to do whatever is necessary to
> setup git so that I can run "svn rebase" to pull in the commits from the SVN repository.
>
> What is the easy way to do this?

There may be other tools that make this easier, but if I had this problem I would simply create two repositories, one for oldCM and one for SVN. I would then merge the two together (as branches with different roots) and do my rebase from there.

I haven't tried this, and maybe there is something I am missing, but there shouldn't be too much pain going that way.

Regards,

Andrew Ardill