[MERGE] Remove the experimental flag of pack formats, giving it to subtree formats.

Aaron Bentley aaron at aaronbentley.com
Mon Jan 14 05:22:52 GMT 2008


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

Adeodato Simó wrote:
> Here's a new version of the patch, which gives the experimental flag to
> the subtree formats. I've made the subtree format non-hidden, just
> experimental. If this is not desired (why?), I can send another patch.

The subtree format enables pre-alpha features.  It reduces performance
and can cause strange behavior.  I strongly recommend against its use,
so it is hidden and considered "experimental".

bb:resubmit

> I've commented in the patch (à-la /usr/bin/diff -p) the format each
> change refers to, because otherwise the diff was very difficult to read.

The patch in a merge directive is not used to perform the merge.  It's a
preview for reviewers.  If the patch doesn't match the changes that are
being requested, there's a possibility of fraud.  Therefore, we verify
that the patch matches the changes that are being requested.  Yours
fails verification because you edited it:

$ bzr merge ~/patches/bzr.pack_no_experimental-2.diff
 M  bzrlib/bzrdir.py

All changes applied successfully.

Preview patch does not match changes

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

iD8DBQFHivGs0F+nu1YWqI0RAv0GAKCH5Eg4oV5J/58d+HzKmPzzGIFxRACfSSCg
AzkkuwOJRPe+6IBKm0v2UyE=
=C+FV
-----END PGP SIGNATURE-----



More information about the bazaar mailing list