[IPython-dev] Bazaar on OS X

[Fernando Perez]

On Thu, Jun 26, 2008 at 9:56 AM, Ville M. Vainio <vivainio at gmail.com> wrote:

> The sole cause of the history folding problem is that people push the
> wrong branch to the wrong place. Once you observe some caution as to
> what you push and where, it's a non-issue.

Mmh, then there's something I've missed.  Because even though I'm
using the two-branch model, one to keep pulling/pushing upstream and
one for local development, I'm *still* getting the same folding issue
when true merging is required.  Basically if there's the need for a
real merge, because I've done work in my local branch while someone
else has pushed to trunk, we get that.  In that  case, --pull fails
with the 'branches have diverged' message and one is forced to merge.

I think that we only have a small issue, and it's one I'm willing to
ignore from now on: Launchpad (*not* bzr, since bzr viz/log is
faithful to the full history) ignores all but one branch when showing
history, and what it actually shows can change with each commit.  When
they improve their display, great, but until then let's just ignore
that point (we're all too busy here to spend time fixing lp).

But the fact that sometimes one *must* merge is unavoidable with
distributed development: even using a special branch for communicating
with upstream, merges sometimes are unavoidable.  Else I'm really
missing something here.

Cheers,

f