'bzr merge -h' should explain how to octopus merge

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

Ian Clatworthy wrote:
> Public bug reported:
>
> Bazaar supports merges with more than 2 parents but the help for merge
> explicitly states merging is a 2 parent operation. We need to mention
> the multi-parent capability and give the actual procedure to use. I
> *think* it's something like:
>
> bzr merge ../parent1
> bzr merge ../parent2 --force
>
> but I'm not completely sure. FWIW, I want this improved so that Stephen
> Turnbull's Bazaar for Git Users document can reference it.
>
> ** Affects: bzr
> Importance: Undecided
> Status: New
>
>
> ** Tags: doc
>

 importance medium
 status confirmed

That is generally how it is done. However the *merge* action *is* a
2-parent operation. At least, I think the second merge will use a
common ancestor based on 2 revisions (I don't think we use 'parent1' to
determine the common ancestor.)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkr8c90ACgkQJdeBCYSNAANTBQCgx0RXJLxHU/noULQEyWslQwF1
ov0AoLnOhxXosk+2ITsmtXH36cnDA3cA
=UHFg
-----END PGP SIGNATURE-----