[IPython-dev] bzr - what am I doing wrong?

Brian Granger ellisonbg.net at gmail.com
Wed Jun 4 16:04:31 EDT 2008


I have a branch of ipython1-dev (ipython1-fc) that I want to merge
back into ipython1-dev.  Previously, I had been doing a simple push
from my local ipython1-fc to ipython1-dev.  But, what is the best way
(after all this discussion) of doing the merge that will get the
history right?


On Wed, Jun 4, 2008 at 1:44 PM, Stéfan van der Walt <stefan at sun.ac.za> wrote:
> 2008/6/4 Fernando Perez <fperez.net at gmail.com>:
>> OK, thanks for all the feedback on bzr.  I'll try to make a little
>> cheat sheet from this discussion and see how it goes.  Ultimately we
>> might send that info back to the bzr team for their docs.  I feel
>> their 'Workflows' pages and sections of the guide are woefully
>> insufficient in critical details (like a number of things you've
>> clarified here).
> I like bzr a lot, but it scares me that we need a cheat sheet to
> achieve something so simple.  Please do provide this feedback to the
> bzr list or #bzr on freenode.net; I would very much like to know what
> they have to say.
> Cheers
> Stéfan
> _______________________________________________
> IPython-dev mailing list
> IPython-dev at scipy.org
> http://lists.ipython.scipy.org/mailman/listinfo/ipython-dev

More information about the IPython-dev mailing list