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

[Aaron Bentley]

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

Alexander Belchenko wrote:
> Aaron Bentley пишет:
>> Or if you had a local mirror of trunk, you could have used that as the
>> submit_branch.
> 
> Yes, my bottom thread is exact local mirror. That's why I ask my
> question about support looms in send command. I don't want and I think I
> don't need to have separate mirror just for make send happy.

When you are not on the bottom thread, your branch is not a local
mirror.  It is far easier to work with a real local mirror, and it only
takes up 40k.

If you really want pain, you can move to the bottom thread, so that
you've got a local mirror, and then run send.  Then you'll need to
specify the right revisions to -r, but it should work.

>> 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.
> 
> I'm still think it's a wrong.

This is what the documentation says will happen.  This is what I have
explained will happen.  You should not be surprised by this.

>> No.  The bundle doesn't contain the necessary revisions, because you
>> specified the wrong submit_branch.
> 
> Aaron, with all my respects to you and other core dev guys, I think
> current bundle/send behavior is the pain in the ass. Old dumb way to
> bundle revisions that user requested is better and understandable. At
> least for me personally. I'd like to have a knob to force old behavior.

Patches accepted.  But note that when you send a thread, you are usually
making a cherry-pick, because you want to send only the changes
contained in that thread.  And the old dumb behavior will do the wrong
thing with cherrypicks.  That's why I changed it in the first place.

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

iD8DBQFH8xxy0F+nu1YWqI0RAvCRAJ9VUdbUx0nXoy+0dPSGgysYc96zrACeNnhP
9Wc24Vf6iHrmq2lLQ4bqKMo=
=cGWu
-----END PGP SIGNATURE-----