[MERGE] Merge directive format 2, Bundle format 4

Aaron Bentley aaron.bentley at utoronto.ca
Fri Jun 29 19:49:39 BST 2007


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

Hi all,

I've got the new merge directive and bundle formats feature-complete.

If we're going to get them into Bazaar 0.18, they'll need review pretty
quickly.  Unfortunately, they depend on the new container format, so
they can't go in before that.

Anyhow, here goes nothing:

Changes in role
===============
Merge directives now provide the human-readable aspects that bundles
had.  Bundles are now simply a revision transport format.  Merge
directives provide patch previews, and verify that the preview matches
the requested change.

Performance
===========
The new bundles are much faster to generate.  I know how to make bundle
installation really fast, but I don't have time to do that before 0.18.

The new bundles are much smaller in the vast majority of situations.
They use a multi-parent delta format, they use bzip2, and they compress
the entire file at once.  The combination of merge-directive and bundle
will not be smaller than a single-commit v09 delta.

Features
========
Merge directives can now specify a cherrypick, and merge will honor
cherrypicks.  Revisions containing tree-references can now be included
in a bundle.  Formats are well-documented.  New bundle-info command
provides statistics and other data about bundles.
Repository.create_bundle method provides targetted API.

Cleanup
=======
Removed some long-obsolete files:
bzrlib/bundle/common.py
bzrlib/bundle/old/send_changeset.py
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGhVRD0F+nu1YWqI0RAvDeAJ9/LKlMi1HNthk0OxBihrrrYiR8DACeJMkq
QAA6YzBdZJJTR+K6lMd6giA=
=HXhI
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fast-bundle.patch
Type: text/x-patch
Size: 212263 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070629/2f9aee04/attachment-0001.bin 


More information about the bazaar mailing list