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_autodj<https://code.launchpad.net/%7Esmstewart91/mixxx/advanced_autodj>from
lp:mixxx.
So I have branched
lp:~mixxxcontributors/mixxx/advanced_autodj<https://code.launchpad.net/%7Emixxxcontributors/mixxx/advanced_autodj>
But but does not cleanly merge. It loses somehow track of the mixxx folder,
because the original mixxx folder is moved to "mixxx.moved" and all changed
files are copied to a new mixxx folder.
I thought this was caused by
http://bazaar.launchpad.net/~smstewart91/mixxx/advanced_autodj/revision/3227.
So I have tryed to unmerge or revers merge this specific revision, but
without success.
Next I have reverted
lp:~mixxxcontributors/mixxx/advanced_autodj<https://code.launchpad.net/%7Emixxxcontributors/mixxx/advanced_autodj>
to 3226 and try to cherry pick the remaining revisions from
lp:~smstewart91/mixxx/advanced_autodj<https://code.launchpad.net/%7Esmstewart91/mixxx/advanced_autodj>
But I also get a "mixxx.moved" and bzr loses the original commit infos by
cherry picking.
Finally I have copied the "mixxx.moved" files manual back and commit the
results as
https://code.launchpad.net/~mixxxcontributors/mixxx/advanced_autodj 3227.
This is the current state. And merging with lp:mixxx still produces a
"mixxx.moved".
Does anyone konw an approach to merge with lp:mixxx and still have Scots
commits in place? How can I find out in which revision the track of the
mixxx folder was lost.
Is there a way to dump the commits and generate them new? Does git-bzr help
here?
Thank your for your help!
Daniel
------------------------------------------------------------------------------
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
