Bundle larger than expected

Aaron Bentley aaron at aaronbentley.com
Wed Oct 15 18:51:13 BST 2008


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Russ Brown wrote:
> Could it have anything to do with criss-cross merges?

Yes.  When calculating which revisions to send, bzr determines the head
revision and the tail revision, and sends everything descended from tail
 that is an ancestor of head.  The tail is determined as the unique_lca,
the same way that merge bases are selected in criss-cross scenarios.
The unique_lca is a conservative choice when merging.  For sending
bundles, it's overkill-- we only need a dominator, not the unique_lca.

> I see that bzr
> send doesn't allow things like --weave.

Your recipient might have different merge algorithms available to them
than you do.  Plus, it's just nicer to leave that choice to the person
doing the merging.

> The error encountered apart, does the criss-cross explain the larger
> bundle size,

Yes.

> and is there anything that I can do to take the criss-cross
> into account when creating the preview diff in the output from bzr send?

No.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkj2LYwACgkQ0F+nu1YWqI31nQCfSqeCYTH1pQXyzx2D/ONMWuhM
7qAAn3FLPRmbS8C2SmA1X38kvw+T91lP
=2lkO
-----END PGP SIGNATURE-----



More information about the bazaar mailing list