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

[Aaron Bentley]

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

Robert Collins wrote:
> On Wed, 2008-04-02 at 10:04 +1100, Andrew Bennetts wrote:
>> Aaron Bentley wrote:
>> [...]
>>> It might be nice to increase the level of support; I think it's been
>>> suggested that bzr send could attach a merge directive for every thread
>>> in the loom to the message.
>> I think I'd usually prefer one message per thread, rather than one message with
>> all threads.
> 
> Thats what I want.

I guess it depends how you're using using threads.

In my work on Launchpad, I have use threads two ways:
- - to separate various layers:
  - database patch
  - ORM updates
  - UI
- - to provide a diff against the last-reviewed version.  I create a new
thread after each review.

This means that many of my threads (the ones due to review) are
closely-related, and I wouldn't want to send them in different emails.

But for the same reason, I don't want to send them all at once.

> The bottom thread should usually be a proxy for the
> submission branch, and not included (which can be detected as its
> revision will be in the mainlines history already).

We could go further and not generate it for any thread whose head is in
the ancestry of the submit branch head.

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

iD8DBQFH8s7Q0F+nu1YWqI0RAtzBAKCAdaSQF1yiXV2w9+SWe/V2zZYnngCfUgFt
HRU8iPz5TboKlNGD4gFZVe8=
=HMmC
-----END PGP SIGNATURE-----