Feature request: Add shorthand -f for "bzr merge --force"

[Jari Aalto]

John Arbash Meinel <john at arbash-meinel.com> writes:

> Jari Aalto wrote:
> >> On 01 Dec 2006 18:23:27 +0200, Jari Aalto <jari.aalto at cante.net> wrote:
> >>>
> >>> to collect changes from multiple brances. In mena time I do not want
> >>> to "ci" untill all merges complete. A shorthand
>
> > But that alias is not available in site X, site Y, site Z whre bzr is
> > installed unless I modify my setup in site X, site Y, site Z ...
> > 
> > It would be better to see it in core. There are other shorthand
> > options now too.
> 
> I don't know if we already have an alias for '-f', I know we have '-F'.
> 
> I'd be happier to understand why you are needing to use it so much,
> since it really isn't meant to be something you use often.

Like this:

    package
    |
    +-original
    +-devel
    +-prepare-merge
    +-bug-xxx-fix
    +-bug-yyy-fix
    +-patch-aaa-by-someone
    +-patch-bbb-by-someone
    
I work in different branches:

    bzr branch original <feature|fix|patch>
    cd <feature|fix|patch>
    ... do the thing
    ... ready, set, go
    bzr ci
    cd ..

Repeat until all done. Now start preparing release:

    cd prepare-merge
    bzr merge ../bug-xxx-fix

But then you're stuck, because this command cannot be repeated without
--force, so you need lot of:
    
    bzr merge --force ../bug-yyy-fix
    bzr merge --force ../patch-aaa-by-someone
    ...
    bzr ci

Until you have collected everything with possible conflict resolution.
I do not want to "ci" after each merge, but to checkin after all the
bugs, fixes, patches are in the release "prepare-merge".

When done, then:
    
    cd ../devel
    bzr merge ../prepare-merge

Jari