On Wed, Oct 18, 2006 at 11:10:11PM -0400, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Linus Torvalds wrote:
>
> > For example, what happens is that:
> > - you like the simple revision numbers
> > - that in turn means that you can never allow a mainline-merge to be done
> > by anybody else than the main maintainer
>
> That's not true of bzr development. The "main maintainer" that runs the
> bzr.dev is an email bot. It's not an integrator-- its work is purely
> mechanical. It can't resolve merge conflicts.
The point here is, that because of using the bot, the revnos on bzr.dev
are indeed stable (and many of the merges are in fact pointless merges
(ie. merges of revision and it's ancestor)). But if you don't use the
bot, than doing:
bzr merge mainline
bzr push mainline
makes your revision the leftmost parent is your revison, not the one
from "mainline". The fact that bzr treats leftmost parent somewhat
specially makes people to replace the above with
bzr branch mainline
cd mainline
bzr merge feature-branch
bzr push
which is, well, more complicated (but you see it's not about main
maintainer -- anybody with write access can push).
--------------------------------------------------------------------------------
- Jan Hudec `Bulb' <bulb@xxxxxx>
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html