Re: bzr unmerge

On Sat, Aug 18, 2012 at 6:58 AM, Henrik Nordström
<henrik_at_henriknordstrom.net> wrote:
> fre 2012-08-17 klockan 19:59 +0200 skrev Kinkie:
>
>> Have you considered "bzr uncommit"?
>
> uncommit do not cut it. uncommit simply moves the branch head to a given
> revision discarding any later revisions, same as git reset --hard for
> those familiar with git. It's ok to use on a private branch to clean up
> mistakes, but MUST NOT, repeat MUST NOT be used after the revisions have
> been pushed to a shared repository.
>
> what I want is a unmerge operation that is a commit in itself much like
> revert, preserving full history, but which requires attention to resolve
> when propagated to other branches, enabling other branches to keep the
> changes or revert them per user choice.

bzr merge N..N-1 .

will back out revision N from this branch in the way you describe.
Received on Fri Aug 17 2012 - 21:54:11 MDT