[IPython-dev] IMPORTANT: Branches merged on launchpad, updates required.

[Fernando Perez]

Hi everyone,

I was able to do a merge of the old SVN history along with the work
done from February until today on the stable-dev branch.  Now the main
branch you download from Launchpad contains the entire project history
since the first SVN commit, at least for the trunk (the first 3+ years
of history were on CVS and I was dumb enough to lose them in the
transition to SVN.  Oh well.).

But please note: you need to re-download IPython from launchpad,
whether you use bzr just to track the tunk or to develop.  Please run
again

bzr branch lp:ipython

to get the trunk out.  This is the web page for the trunk:

https://code.launchpad.net/~ipython/ipython/trunk

Note that while the 990 commit swallowed the entire history of the
stable-dev branch,  that is only the case when viewing it via the
launchpad web interface.  If you get the branch and view it locally
(with bzr viz, for example), you'll see the whole history with
individual commits.

To developers: please remember the worfklow guidelines from

http://ipython.scipy.org/moin/Developer_Zone/Developer_Guidelines

and please update/improve that page if my instructions were in any way
incorrect (I'm just now really getting the hang of a good bzr
workflow).

I have marked the stable-dev branch as "merged", so it doesn't appear
by default anymore in most displays at launchpad, but it was NOT
deleted (and it won't), it's still here for reference:

https://code.launchpad.net/~ipython/ipython/stable-dev

So it seems we're fully off SVN!  Welcome to the great bright world of
DVCS everyone :)

Cheers,

f