Wiki Incorrect?

[John A Meinel]

Florian Weimer wrote:
> * James Blackwell:
>
>
>>Bazaar-NG is a distributed revision control system that collects logically
>>related changes. These individual changes are lumped into one cohesive
>>group which typically represent a bug fix or a new feature. These changes
>>are easily transferred from one branch to another with simple to use
>>commands like "bzr pull" and "bzr branch".
>
>
> This description suggests that you can easily pick up a couple of
> small, incremental patches and combine them into one larger patch.
> Can bzr really do this in a straightforward manner?
>
>

Well, when you merge, the final commit is a way of taking the changes
done in the other branch, and committing them to the current branch.

Now, when that is committed, you have 2 parents. If you do the diff
against one parent, you will get the rollup of the opposite branches
changes.

For example:

# A - B - C - D - E
#   \           /
#     F - G - H

So E is a merge of F-G-H back into the A-B-C-D branch.

Assuming E does not introduce other work, just merges the two branches.
Then doing a diff of E vs D is basically a roll-up of F-G-H, doing a
diff of E vs H is a rollup of B-C-D.

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/20051004/e3776e36/attachment.pgp