Re: [Mixxx-devel] Git / GitHub migration nearing completion

2013-06-14 Thread Daniel Schürmann
Hi Owen, Thank you for testing! Merging works, (except of conflicts). I have bzr-fastimport 0.13.0-2 (Ubuntu Raring) installed. Also the patch seems not to be included :-/ http://bazaar.launchpad.net/~bzr/bzr-fastimport/trunk/view/353/revision_store.py Could it be that the issue is solved in

Re: [Mixxx-devel] Git / GitHub migration nearing completion

2013-06-14 Thread Daniel Schürmann
Hi RJ, thank you for clarifications. I fully agree to your work flow ideas. I also like the idea to have mixxxcommunity/mixxx only as a slowly cluttered sanbox without a a fork of the "offical" branches. Kind regads, Daniel

Re: [Mixxx-devel] Legacy git Mixxx repositories

2013-06-14 Thread RJ Ryan
On Fri, Jun 14, 2013 at 12:10 PM, Owen Williams wrote: > On Fri, 2013-06-14 at 10:55 -0400, RJ Ryan wrote: > > Nice -- those instructions worked for me to recover an existing branch > > (like http://github.com/xrg/mixxx branch xrg-1.10) except: > > > > > > 1) bzr export failed -- does that synta

Re: [Mixxx-devel] Legacy git Mixxx repositories

2013-06-14 Thread Owen Williams
On Fri, 2013-06-14 at 10:55 -0400, RJ Ryan wrote: > Nice -- those instructions worked for me to recover an existing branch > (like http://github.com/xrg/mixxx branch xrg-1.10) except: > > > 1) bzr export failed -- does that syntax work? Maybe curl/wget > git-filter-branch-command-all.sh from baz

Re: [Mixxx-devel] Legacy git Mixxx repositories

2013-06-14 Thread RJ Ryan
Nice -- those instructions worked for me to recover an existing branch (like http://github.com/xrg/mixxx branch xrg-1.10) except: 1) bzr export failed -- does that syntax work? Maybe curl/wget git-filter-branch-command-all.sh from bazaar.launchpad.net instead? 2) Don't see the purpose of branchn

Re: [Mixxx-devel] Git / GitHub migration nearing completion

2013-06-14 Thread Owen Williams
If you didn't have any problems running git-bzr-ng, you didn't see the bug. This is the patch in question: http://bazaar.launchpad.net/~agrimm/bzr-fastimport/baseline-commit/revision/342 The simple way to check it is to look at SHA values for commits that should be shared with trunk, or just try

Re: [Mixxx-devel] Git / GitHub migration nearing completion

2013-06-14 Thread RJ Ryan
On Fri, Jun 14, 2013 at 2:45 AM, Daniel Schürmann wrote: > Hi RJ, > > > (maybe someone is weaponizing the Mixxx source code for the US > military?). > Yes he may do this, as long he publish his work is published under the GPL > later. LOL > But without my support! > > I is required to publish all

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

2013-06-14 Thread Daniel Schürmann
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