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

[Fernando Perez]

On Wed, Jun 4, 2008 at 8:09 AM, Ville M. Vainio <vivainio at gmail.com> wrote:
> On Wed, Jun 4, 2008 at 5:53 PM, Fernando Perez <fperez.net at gmail.com> wrote:
>
>> 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
>
> No, there is no point in doing both push and pull because both
> operations make the repositories equal.
>
> After pulling, you can just delete your ipfix branch and create a new
> branch when you intend to do a change.

Mmh, what if you have stuff in your local copy that you're playing
with still but not quite ready to commit?  I'm not sure I like the
idea that the local branch must be immediately gone after each commit.
 It seems to me that the iptrunk branch should be pretty 'pure' from
local work, but I do want a more long-lived area for local work.  Or
is this just 'going against the grain' of bzr workflow?


Cheers,

f