Forget a certain revision from the repository (BZR)

i have a bzr repository with revision number 701 and some time ago on revision number 680 i committed some code that changes every file in the repository (i.e. a source code formatter changes every file ) now i want to have the old formatting with out missing the changes i made after revision 680

how can i forget revision number 680 the one that changes every f开发者_如何学JAVAile

1st way: bzr merge -r680..679, but you have to be ready to resolve many conflicts in the places where you made changes after re-formatting.

2nd way: use bzr rebase command from bzr-rewrite (former bzr-rebase) plugin.