[IPython-dev] Porting SVN history to Launchpad - help needed.

[Fernando Perez]

On Sat, May 31, 2008 at 11:10 PM, Prabhu Ramachandran
<prabhu at aero.iitb.ac.in> wrote:
> Fernando Perez wrote:
>>
>> The problem I'm having is how to merge the latter into the former
>> while preserving the full  history.  Because the bzr trunk was
>> initialized without any SVN history, every attempt I've made so far
>> has failed.  I've tried bzr merge and rebase with various flags,
>> without any success.  I'm not even sure it's possible to do this
>> cleanly, I'm afraid.
>
> Not sure if this will work or if you've tried it, but can't you do the
> reverse?  I.e. create a freshly imported bzr tree with the SVN history of
> the older code in SVN then merge *that* with the zero-history branch?

I've tried that, but bzr merge refuses to apply the merge because it
doesn't see the two as having a common ancestor.  This seems to do
exactly what I'm after:

http://spacepants.org/src/bzrgraft/

Unfortunately the warnings about it being badly outdated are a bit
worrying.  I'm going to give it a try nonetheless, we'll see how it
goes.

Cheers,

f