Re: Installing changes from branches

[Óscar Fuentes]

Stefan Monnier <address@hidden> writes:

[snip]

>> Something like a collapsed merge would be good, i.e. merge from quickfix,
>> but only record it as a single commit.
>
> Indeed, you can also do that:
>
>   cd .../trunk
>   bzr merge .../quickfix
>   bzr revert --forget-merges
>   bzr commit ...
>
> that's virtually the same as "diff&patch": it forgets all about the
> branch's history.

This requires to reset the `quickfix' branch afterwards, or the next
time it will merge the same changes again. So the full sequence would be
(untested):

  cd .../trunk
  bzr merge .../quickfix
  bzr revert --forget-merges
  bzr commit ...
  cd .../quickfix
  bzr pull --overwrite

The last command discards the local changes made on `quickfix' and makes
that branch a clone of `trunk'