reverse cherry picking + merge docs

[Colin D Bennett]

On Fri, 12 Mar 2010 12:02:04 +0900
David Muir <davidkmuir at gmail.com> wrote:

> Ewan Milne wrote:
> > 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.
>...
> 
> So if you remove the submit_branch setting, will it get set to the
> next branch you merge in? Or does it only do that the first time you
> merge?

If the submit branch is not set, then any ‘merge’ or ‘send’ operation
will set it in branch.conf:

--------------------------------------
/tmp/t/x$ bzr info
Standalone tree (format: 2a)
Location:
  branch root: .
/tmp/t/x$ bzr merge ../y
Nothing to
do. /tmp/t/x$ bzr info
Standalone tree (format: 2a)
Location:
  branch root: .

Related branches:
  submit branch: /tmp/t/y
/tmp/t/x$ 
--------------------------------------

I usually set the submit branch for a top-level trunk branch to ‘.’ so
that future confusion is avoided.

Regards,
Colin