[PATCH]: Optional explanation for options

[John A Meinel]

Robey Pointer wrote:
>
> On 22 Sep 2005, at 19:09, John Arbash Meinel wrote:
>
>>> Robey Pointer wrote:
>>>
>>>>
...

>>> If it's something you really want, it is easy to add. I'm just  trying to
>>> let you know what that will and won't change.
>
>
> What I imagine is something like this:
>
> $ bzr branch bzr.dev bzr.dev.me
> $ cd bzr.dev me
> [edit files in bzr.dev.me]
> $ bzr commit -m "add FTL-drive support, with careful spacetime tuning"
> [oops, bug!  more editing]
> $ bzr commit -m "oops, must turn off einstein laws for FTL"
> [oops, another bug!]
> $ bzr commit -m "ack don't stray so close to black holes"
>
> Each message makes sense to me, but if I submitted the roll-up
> changeset and it was summarized as "ack don't stray so close to black
> holes" (which the current cset seems to do by floating that message  to
> the top) it could lead to much confusion. :)

Good enough for me. Try the lastest version. I'm pretty sure it does the
right thing.

>
> For such a roll-up patch, I'm okay with the cset containing the list  of
> revisions and their individual messages (it's kind of a nice view  of
> the history of the work done for that patch), but it should be  possible
> for the recipient to commit it as a single revision,  containing a
> summary message that may be different from any  individual commit's
> message.  (In this case, maybe "first draft of  FTL support from robey".)

Well, the trick is that when you merge the changes, that *is* a new
revision, and thus needs to be committed as such.

I believe the current changeset code follows the push/merge split, where
it can try to "auto-commit" aka pull the changeset, or it can treat it
as a merge.

John
=:->

PS> The changeset plugin has been updated, but for some reason "bzr cset
| bzr verify-changeset" is failing with an invalid Inventory checksum.
We might be running into an Inventory update boundary, where I can't
re-create old inventory entries, because the code has been updated.

>
> robey
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050923/9f66ee2e/attachment.pgp