[IPython-dev] Porting SVN history to Launchpad - help needed.
Sat May 31 23:14:07 CDT 2008
On Sat, May 31, 2008 at 9:04 PM, Fernando Perez <firstname.lastname@example.org> 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.
I forgot to add that I tried to make a bundle containing the history
of the entire new bzr trunk and apply that to the svn branch, but it
produced 141 conflicts! Cleaning merge conflicts by hand is a huge
PITA, cleaning 141 is way more than I think any of us is either
interested in doing, or likely to do without making mistakes.
I'll keep on trying, but any ideas would be very welcome at this point.
More information about the IPython-dev