[loom:MERGE] fixing "main" part of setup.py
aaron at aaronbentley.com
Thu Apr 3 16:53:39 BST 2008
-----BEGIN PGP SIGNED MESSAGE-----
Eric Siegerman wrote:
> On Tue, 2008-04-01 at 12:13 -0400, Aaron Bentley wrote:
>>> And here is the patch. Is it mergeable patch actually?
>> No. The bundle doesn't contain the necessary revisions, because you
>> specified the wrong submit_branch.
> Yet the diff does contain the change. It seems odd to me that the diff
> and bundle wouldn't agree.
> Is that the intended behaviour?
Yes. In a cherrypicking scenario, *more* revisions are required than
the ones represented by a diff. In a reverse-cherrypick scenario,
*fewer* revisions are required than the ones specified in the diff.
Only the submit_branch is used to determine which revisions must be
included in the bundle.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar