reverse cherry picking + merge docs

[Ewan Milne]

Martin Pool <mbp at canonical.com> wrote:

>> On another note, what should the submit branch be for the upstream branch?
>> Should it be itself?
>>
>> ie. I have:
>> trunk -> :submit = first feature branch I merged in
>> staging -> :submit = trunk
>> production -> :submit = staging
>
> I don't think it should be set there.
>
> Perhaps it would be easier to understand this stuff if we just changed
> to calling them "default merge source", "default push destination",
> etc?

I have also wondered about this. Are you recommending that for a trunk
branch, parent_location and submit_branch should be removed from
branch.conf? Hope so, as this is what I've tended to do.

However, if I have only a parent_location set on a branch, and no
submit_branch, then Bazaar Explorer reports that the "Branch is fully
merged into its submit branch". Which _is_ confusing for a branch with
no configured submit branch.