[PLUGIN] bzr changeset now support rollup changesets (and bzr send-changeset)

[John A Meinel]

Martin Pool wrote:
> On 29 Jun 2005, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
>
>>Martin Pool wrote:
>>
>>>* The base is redundant with the first parent and can be removed.
>>
>>This introduces the constraint that the changeset can never be relative
>>to anything except the first parent.  For this branch
>>A -> B -> C -> D
>
>
> Sorry, my mistake.  Both seem to be needed.  We can, at least, avoid
> sending the SHA1 of the revision twice because it must be the same.
> Perhaps we can avoid identifying the specific base if there's only one
> parent.
>

Actually, the other reason for supplying the base id, is that it may not
be A. If your branches look like:

You- A - B - C - D
#    |
Me-  + - E - F - G

And I want you to merge my changes E,F,G into your branch @ D,
Theoretically, I could use D as my base_id, rather than using A. So I
would know that my changes would directly apply to your tree. (since
they were generated against it).

I suppose that changeset is really the line from D to a theoretical H

You- A - B - C - D
#    |             \
Me-  + - E - F - G - H

Which should be the same as
You- A - B - C - D - H
#    |             /
Me-  + - E - F - G

The changeset is the line, so the two should be identical.
In theory, 'Me' could actually do the merge for H, and then give you a
different changeset including it.

But the entries for the 'diff' portion of a changeset are just 'target'
relative to 'base'.
The rest of the stuff is just to let you know how I computed it, so that
you can add the same meta information as if you did a 'bzr merge'
instead of 'bzr apply-cset'.

John
=:->
-------------- 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/20050629/eefb33d6/attachment.pgp