[MERGE/RFC] Merge prefers to use submit branch

[John Arbash Meinel]

Aaron Bentley wrote:
> Aaron Bentley wrote:
>> John Arbash Meinel wrote:
> 
>> I'd rather not introduce new locations if I can help it, because every
>> bit of metadata is something the user must manage sooner or later.  But
>> if that's what it takes to get your full approval, I can do that.
> 
> John, could I get your feedback on this please?
> 
> Aaron

I think it should be well documented in NEWS, since it is a behavior change.

I know it fits your use case, I'm not sure how universal it is. Having 1
use case is more than having 0, though.

Actually it goes back to something we had a long time ago. Which is
having a "if you branch from THIS, set your submit location to X". That
was at least part of the original "submit" spec. Which would have fit the:

 bzr branch upstream
 <hack>
 bzr commit -m "foo"
 bzr send

Having it be:

 bzr branch upstream
 <hack>
 bzr commit -m "foo"
 bzr merge
 bzr commit -m "updating to tip"
 bzr send

However, both of these would also work if we used the 'parent' as the
send location and the merge location.

I'm not sure how you are doing it that your parent is not your submit
location.... I would be interested to have you write down your steps.
(Though you may have already done that, this thread has gone on for too
long.)

Anyway, long winded just to say that I don't really care. If it works
for you and makes something easier, I'm okay with it.

John
=:->