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

[Aaron Bentley]

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

Alexander Belchenko wrote:
> Consider this trivial patch.
> 
> I have a question: what's plans to teach `bzr send` understand looms?
> 
send does not fundamentally need to support looms, because it uses
revision-ids to specify the merge.

To send just the current thread, you can do "bzr send -r thread:.."

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.

> And I had troubles to figure out how to `bzr send` it. Currently I did:
> 
> bzr send -r-2..-1 . . 

You should have done:
bzr send -r-2..-1
http://bazaar.launchpad.net/%7Ebzr-loom-devs/bzr-loom/trunk

Or if you had a local mirror of trunk, you could have used that as the
submit_branch.

You should never specify the same directory for the source branch and
the submit_branch.  The submit_branch is used to determine which
revisions need to be sent.  Since you specified a submit_branch that
already has all the necessary revisions, no revisions were sent.

You should never specify . as a public branch.  This is an optional
parameter.  There's no need to specify it at all.  But if you do specify
it, you must specify a real public location, not a local path.

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

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

iD8DBQFH8l8h0F+nu1YWqI0RAuMrAJ95MI4OPt+0p83pJzRh+mT/7CZ7zgCfcOkB
ESr4821z4kc6Xx8ftw2w5D8=
=pN65
-----END PGP SIGNATURE-----