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

[Fernando Perez]

Howdy,

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:

On Wed, Jun 4, 2008 at 1:11 AM,  <noreply at launchpad.net> wrote:
> ------------------------------------------------------------
> revno: 994
> committer: Fernando Perez <Fernando.Perez at berkeley.edu>
> branch nick: trunk-dev
> timestamp: Tue 2008-06-03 14:09:11 -0700
> message:
>  merge remote
> modified:
>  IPython/Extensions/pspersistence.py
>  IPython/gui/wx/ipshell_nonblocking.py
>  IPython/gui/wx/ipython_view.py
>  doc/ChangeLog
>  doc/ipython.1
>  doc/source/ipython.rst
>    ------------------------------------------------------------
>    revno: 991.1.4
>    committer: Ville M. Vainio <vivainio at gmail.com>
>    branch nick: ipython
>    timestamp: Tue 2008-06-03 23:05:35 +0300
>    message:
>      changelog: report UsageError on %store -w w/o arg,and other usage pattern errors. Bug report by Johann Cohen-Tanugi.
>    modified:
>      doc/ChangeLog
>    ------------------------------------------------------------
>    revno: 991.1.3
>    committer: Ville M. Vainio <vivainio at gmail.com>
>    branch nick: ipython
>    timestamp: Tue 2008-06-03 23:03:02 +0300
>    message:
>      pspersistence report UsageError's instead of crashing on 'error'
>    modified:
>      IPython/Extensions/pspersistence.py

etc..

In this case a sequence of commits from Ville got swallowed in by my
merge (I did use --pull which is supposed to 'fast forward') but no
luck.  Obviously next time anyone else commits it will be my changes
that get folded in, etc.  It seems the notion of  a 'shared mainline'
with multiple push persons is just not how bzr likes to work, or I'm
doing something very, very wrong with it...

Cheers,

f