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

[Fernando Perez]

On Wed, Jun 4, 2008 at 4:36 AM, Ville M. Vainio <vivainio at gmail.com> wrote:
> On Wed, Jun 4, 2008 at 11:21 AM, Fernando Perez <fperez.net at gmail.com> wrote:
>
>> I am now using the two-branch system we discussed earlier, but still
>> when I pull in the changes from trunk and push again, the problem of
>> 'history folding' happens:
>
> You are doing something wrong.
>
> What you need to do is (iptrunk is your local trunk, ipfix is your
> change branch):
>
> cd /iptrunk
> bzr pull
> bzr merge ../ipfix
> bzr ci
> bzr push

Ah, OK.  I got confused by the post that said that 'merge --pull' was
the way to 'fast forward' the history, and was using that.

What is the correct mechanism for getting the trunk changes that come
from other developer into ipfix?  Because at some point you still need
to make sure you get those as well, so that you stay in sync with
them.  Should you do the same as above but iptrunk<->ipfix?  Or can
you push from iptrunk like this?

cd /iptrunk
bzr pull # from lp/upstream
bzr push ../iptrunk

Is this correct?  That would be nice, in that it would cleanly (for my
mind) split the roles into:

1. cd /iptrunk: all things that involve communicating with launchpad,
including sending local changes from ipfix, retrieving upstream
changes and pushing them to ipfix

2. cd /ipfix: all things that involve committing local work but do not
touch the 'outside world'.

Thanks

f