Bazaar Mercurial Plugin to access BitBucket
Colin D Bennett
colin at gibibit.com
Thu Oct 20 19:29:39 UTC 2011
On Fri, 21 Oct 2011 04:13:45 +0900
"Stephen J. Turnbull" <stephen at xemacs.org> wrote:
> The problem shows up somewhat differently in bzr, as a "floppy
> mainline": if a developer merges *from public into private*
> instead of the other way around, then suddenly his local commits
> become the public mainline when he pushes -- and all the revnos
> since the fork change. But at root it's the same problem:
> concurrent development == multiple heads in the project, which
> must be merged to give definition to the mainline. In bzr's
> case, merged in the correct direction.
>
> For developers experienced in such workflows, it may be that no
> constraint is necessary. But I would not set up a project
> repository in Bazaar without configuring the appropriate policy
> to protect the mainline (I think it's "bzr init
> --append-revisions-only"). Wrong-way merges are an attractive
> nuisance in Bazaar.
Ditto. When I've introduce Bazaar to new users (accustomed to
other centralized VCS systems), we often had problems where they
would try to push the “feature branch” to the mainline after
merging mainline into the local feature branch.
Also, I've accidentally pushed to mainline before as well (easy
when bzr has remembered it somewhere and I don't explicitly specify
push location on the command line...).
I think it is CRITICAL to set append-revisions-only on mainline and
actually any non-personal branches available to other users. I
haven't looked lately, but I hope this is mentioned prominently in
the Bazaar introductory documentation regarding workflow and
project setup.
Regards,
Colin
More information about the bazaar
mailing list