final my problem is solved.
First, I did a a revers merge of the faulty commits, which results in a
mixxx.moved folder.
bzr merge -r3191..3190
The mixxx.moved folder was reintegrate in the original mixxx folder by
bzr move mixxx.moved mixxx
Luckily the revision history of the content of the mixxx.moved folder was
preserved.
2013/6/12 Neale Pickett <ne...@woozle.org>
> On Tue, 11 Jun 2013 08:57:29 +0200
> Daniel Schürmann <dasch...@mixxx.org> wrote:
>
> > Yesterday I had a fight with bzr and finally bzr has won :-(
>
> This happens to me all the time, and even when I get it to do what I
> wanted, I still feel like bzr won.
>
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org
Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel
