Re: [Mixxx-devel] need help with Baazar merging advanced_autodj

Now it is really solved in my bzr solution there was finaly still a mixxx.moved folder. within the original mixxx folder. So bzr move was no good idea. I solved the problem finally with migration to git I have first tryed cherry-pick a range of revisions, but with this I have lost all the origina

Re: [Mixxx-devel] need help with Baazar merging advanced_autodj

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

Re: [Mixxx-devel] need help with Baazar merging advanced_autodj

On Tue, 11 Jun 2013 08:57:29 +0200 Daniel Schürmann 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. -

[Mixxx-devel] need help with Baazar merging advanced_autodj

Hi Yesterday I had a fight with bzr and finally bzr has won :-( I hope someone can help: I want to merge lp:~smstewart91/mixxx/advanced_autodjfrom lp:mixxx. So I have branched lp:~mixxxcontributors/mixxx/advanced_autodj