Re: Installing changes from branches

[Óscar Fuentes]

Stefan Monnier <address@hidden> writes:

> I noticed recently that some people install small changes
> from "quickfix branches" by something like:
>
>   cd .../trunk
>   bzr merge .../quickfix
>   bzr commit ...
>
> This is fine if the quickfix has only a single commit or OTOH is a long
> running branch with many different real commits.  But not if the branch
> has barely more than 1 real commit plus various "merge from trunk".
> E.g.:

[snip]

> Another very good solution is
[snip]

And there is yet another solution, which is to bind the quickfixes
branch to upstream. Instead of `bzr merge', do `bzr update'. When you
finish a change, `bzr commit' will send it automatically upstream.