Bazaar Mercurial Plugin to access BitBucket

[Martin Geisler]

"Stephen J. Turnbull" <stephen at xemacs.org> writes:

> Martin Geisler writes:
>
>  > We've talked about allowing such trivial merges for normal
>  > changesets. There is nothing in Mercurial that would break -- you
>  > can infact do it right now if you use named branches.
>  >
>  > The reason it's prevented right now is that it does indeed look
>  > like a confusion: changeset B already has all the changes in 1, so
>  > merging with 1 is redundant. I understand that you can use such an
>  > empty merge to document that A and B were "separate" from the
>  > mainline (even though they really wasn't...).
>
> Ah, but usually they "really" are. You work on them in a separate
> workspace, on separate time, and may need approval from a gatekeeper
> to push. Even if you have a significant body of work, if it has been
> reviewed (selected, detected, inspected, and nee-glected!) by several
> experts, it may indeed make sense to summarize it in one log message.

Yes, I actually like the way Bazaar uses the merge commit message to
summarize what it is you're landing on the mainline -- it seems like a
natural thing to do, especially when you then hide the merged-in branch.

>  > It is always easy to construct small mini-examples that show bad
>  > features. The real test is how the system works when you really use
>  > it.
>
> How many years Bazaar must exist before it's allowed to be an example
> of "best practice"? (Some of which *you* may think are unintuitive or
> even yucky, but are valued, even required, by others in their
> workflows!)
>
> Sure, in some cases such special cases end up making the main
> workflows ugly or cramped. I don't see how this is such a case.

In the part you didn't quote, I wrote that you normally get changesets
on the mainline too and you have to do a real merge. That was my only
point -- that a real merge will happen in both systems and so both give
you a great opportunity to describe what it is you're merging into the
mainline. But as I've said: we've discussed lifting this restriction.


-- 
Martin Geisler

Mercurial links: http://mercurial.ch/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20111022/8aba3303/attachment.pgp>