[IPython-user] Bug in ipython -pylab and %who ?

[Ville M. Vainio]

On Sun, Mar 9, 2008 at 8:30 PM, Fernando Perez <fperez.net@gmail.com> wrote:

>  Hey, I have no objection to you using bzr for updating the trunk, but
>  before we diverge too much in history, we should then consider what
>  needs to be done so we don't lose history.  Are you planning on
>  merging back into  SVN regularly until we fully transition?  Once we
>  officially stop using SVN for everything, I do NOT want to start a
>  clean bzr branch where our entire trunk history is lost.  I know that
>  launchpad had issues pulling the SVN history due to an unreliable
>  connection, but we still need to figure out a solution for that
>  problem.

Launchpad now has the svn imported, so the history is not "lost" -
it's still available there, albeit in different branch. It doesn't
really matter, since there won't be branching from that old stuff.
That is, we can do "bzr annotate" on that old branch to find out why
some commit is there, but we don't need that history for branch/merge
tracking.

The fact that we now don't have the entire history in the branch is a
win for performance (especially bzr push) and size as well, due to the
fact that bzr branches will contain the full history (even if shared
repos help a little bit here - but launchpad does not implement shared
repos yet). Also, there is a symlink in SVN, which breaks bzr for
Windows (for now at least). That means the fresh, clean bzr repository
is best.

>  It seems that  upstreaming back into SVN for now is the easiest
>  solution, or do you have a different plan?

I won't do this "regularly", but I will probably just dump everything
to svn before we release in one commit (for convenience of people who
follow the svn). I don't think we should do the release from svn,
though, and the bzr stable-dev branch will have the "authoritative"
stuff. That really means svn is a second-class citizen now.

-- 
Ville M. Vainio - vivainio.googlepages.com
blog=360.yahoo.com/villevainio - g[mail | talk]='vivainio'