[loom:MERGE] fixing "main" part of setup.py

[Aaron Bentley]

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

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.

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

iD8DBQFH9P2D0F+nu1YWqI0RAjbYAJwL6ObYuq6BGHNaefkE9Itht74VvACfRnnR
5QAs8XpQGjxHF410n/KvEBM=
=+xMP
-----END PGP SIGNATURE-----