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

[Robert Collins]

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. 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).

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080402/120516e2/attachment.pgp