[IPython-dev] Release plan for 0.9

[Fernando Perez]

On Tue, Aug 12, 2008 at 12:23 AM, Vivian De Smedt <vivian at vdesmedt.com> wrote:

> No problem I will adapt the code of the synchronize-editor branch as soon as
> possible.
> I'll be glad if you could send me the bzr command I should use to merge the
> trunk cod in the synchronize-editor branch.

Basically the easiest workflow is to have the following:

bzr-directory/
  ipython/  -> trunk, you get this with 'bzr branch lp:ipython'
  your_branch/ -> where you're working

then in the checkout of trunk, you periodically do

bzr pull

to pull updates that others have pushed to the trunk.  When new
updates are in, you can propagate them to your working branch via:

cd your_branch
bzr pull ../ipython/

if the above fails because a merge is required, you do instead

bzr commit -m"Checkpointing local changes before merge"
bzr merge ../ipython
bzr commit -m"Merge with upstream"

This keeps your changes in sync with the upstream development on
trunk, which is important to ensure that nothing breaks in your
development.  You can then periodically do:

bzr push

This sends your changes to launchpad, so that I and others can get
them for review, merging, sharing, etc.

I hope this is clear enough, let us know if you have any other questions.

Regards,

f