merge and left most parent

[INADA Naoki]

Hi, all.

When working on local feature branch and remote trunk branch (no local
trunk mirror),
merge -> push cycle creates non trivial history.

1) branch and create local revison.

A - B - C - D (trunk) (remote)
      \
        E (feature) (local)

2) merge from trunk

A - B - C - D (trunk at remote)
      \      \
        E --- F (feature at local)

3) push ... wow!

A - B - E ---- F (trunk at remote) (feature at local)
      \      /
        C - D

3') Some people wanted:

A - B - C - D - F (trunk at remote) (feature at local)
      \       /
        E ----

IIRC, to create such a history, person should branch another
trunk-mirror branch and
merge from trunk-mirror.
Does bazaar offer an option that selects remote rivision as a main parent of
merging revision? Or are there any way to create 3' history without
trunk-mirror?

--
Naoki INADA  <songofacandy at gmail.com>