reverse cherry picking + merge docs

[Martin Pool]

On 11 March 2010 14:19, David Muir <davidkmuir at gmail.com> wrote:
> In the docs for reverse cherry picking, it says to do:
>
> bzr merge -r 10..9
>
>
> which probably won't do as you expect, since it works off of the submit
> branch rather than the current branch. The docs are rather vague about this,
> and I had to dig around to figure out why it was grabbing the wrong
> revisions.

wow, that would be quite confusing.

>
> Since (from my experience) reverse cherry picking is usually done within the
> current branch, shouldn't merge run off of :this instead of :submit?

Or just "bzr merge -r 10..9 ." is what I would normally say.

>
> Also, it would be good if the docs mention that merge uses :submit as its
> default. Even in the docs for the submit_branch config setting, it only
> mentions that it's used by `bzr send`.

Is that actually true? I thought it came from the parent branch by default.

Would you like to have a go at updating the docs?  They're just
text-like files in the doc/ directory of bzr's source tree.

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




-- 
Martin <http://launchpad.net/~mbp/>