Send and Bundle Buggy (was: Re: [MERGE] Add a smart method method that can pull a set of revisions in a single request)

[Aaron Bentley]

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

Andrew Bennetts wrote:
> "bzr send --help" doesn't tell me what "-r" actually does.  It changes the
> human-readable patch, but not the bundle?

The -r on send lets you specify a particular range of revisions to
merge.  If you specify -r x..y, the x is BASE, and the y is OTHER.

It affects the merge directive (the revision_id and base_revision_id
fields) and the preview patch.

When you merge a merge directive, the effect is as though you did "merge
- -r x..y".  Which will be a cherry-pick if the ancestors aren't present,
and a plain merge if they are.

> Another drawback to submitting that bundle is that it appears Bundle Buggy
> considers it to have superseded the two bundles it depended on (because it
> includes their revisions).  It would be nice to have an obvious way to submit
> branches that depend on other branches that Just Worked without thinking, the
> way "bzr send" now Just Works for a single branch off bzr.dev.

I can change it so that it uses the base_revision_id and revision_id
from the merge directive to determine which merge requests have been
superseded.

It means actually installing revisions from these untrusted directives.
 However, I was already working towards that, because not all merge
directives have bundles.

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

iD8DBQFGw7W90F+nu1YWqI0RAi5iAJ995q7GzS3BpjI+Hx4xcHqyVpX2TQCfWRGP
zaxr85ShV0MVRhGHsKO72cw=
=jjI4
-----END PGP SIGNATURE-----