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

2013-06-13 Thread Daniel Schürmann
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 your work on Mixxx in terms of GPL. Maintaining a branch without a public

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

2013-06-13 Thread Daniel Schürmann
Arrg .. :-/ What is the bug about? I have yesterday cleaned up Scotts branch. @Owen: It looks like a success, But can you have a look? https://github.com/daschuer/mixxx/tree/advanced_autodj_2 Thank you Daniel 2013/6/13 Owen Williams > also note that I had to hand-patch git-bzr-ng due to a b

Re: [Mixxx-devel] Legacy git Mixxx repositories

2013-06-13 Thread Daniel Schürmann
Hi Owen, I agree to Nathan, that we should at least describe an "offical" way how to Do this. something like this: (draft; untested) 1. rename your original repository to mixxx-legacy 2. fork mixxxdj/mixxx on Github 3. git clone git://github.com//mixxx.git 4. git remote add upstream git://github

[Mixxx-devel] Re: Legacy git Mixxx repositories

2013-06-13 Thread nathan dotz
Better yet, ask them to turn theirs into forks of the official one :)Also, I haven't had time to contribute much noise to this recently, but good work on the github migration everyone! I think this is a great step in the right direction! On June 13, 2013 at 3:14:40 PM, RJ Ryan (rr...@mixxx.org) wro

Re: [Mixxx-devel] Getting rid of the 'mixxx' directory in the root of the repository.

2013-06-13 Thread RJ Ryan
On Thu, Jun 13, 2013 at 5:00 PM, Owen Williams wrote: > that may work, but anything that complicates the migration procedure > risks causing problems for other branches, history, etc. As soon as lp > and github get out of sync, it's going to be very tough to migrate any > other user branches.

Re: [Mixxx-devel] Getting rid of the 'mixxx' directory in the root of the repository.

2013-06-13 Thread Owen Williams
that may work, but anything that complicates the migration procedure risks causing problems for other branches, history, etc. As soon as lp and github get out of sync, it's going to be very tough to migrate any other user branches. I would prefer my second suggestion, zeroing out the lp:mixxx rep

Re: [Mixxx-devel] Getting rid of the 'mixxx' directory in the root of the repository.

2013-06-13 Thread Max Linke
I'm so for that. While you are at it can we also get rid of mixxx-winlib32-msvc? There is only one header file in there. On Thu, 13 Jun 2013 15:24:01 -0400 RJ Ryan wrote: > Now that everyone is getting disrupted by the bzr to git switch, there's no > time like now to get rid of the 'mixxx' fold

Re: [Mixxx-devel] Getting rid of the 'mixxx' directory in the root of the repository.

2013-06-13 Thread Owen Williams
Maybe also commit an update to lp:mixxx that deletes everything but a README saying "use github now"? On Thu, 2013-06-13 at 15:24 -0400, RJ Ryan wrote: > Now that everyone is getting disrupted by the bzr to git switch, > there's no time like now to get rid of the 'mixxx' folder inside the > reposi

Re: [Mixxx-devel] Getting rid of the 'mixxx' directory in the root of the repository.

2013-06-13 Thread RJ Ryan
Hm, can't you just merge with github master instead of assuming it will apply fast-forwarded? That will be true regardless of whether we do this move if there are any commits to lp:mixxx after we've all switched to committing on GitHub. On Thu, Jun 13, 2013 at 3:43 PM, Owen Williams wrote: > Th

Re: [Mixxx-devel] Getting rid of the 'mixxx' directory in the root of the repository.

2013-06-13 Thread Owen Williams
That should be fine as long as we nver sync from launchpad trunk again. speaking of which, maybe I should sync from trunk one more time before you do that :) On Thu, 2013-06-13 at 15:24 -0400, RJ Ryan wrote: > Now that everyone is getting disrupted by the bzr to git switch, > there's no ti

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

2013-06-13 Thread Owen Williams
also note that I had to hand-patch git-bzr-ng due to a bug. It's much easier if you let me do the conversion :). Owen On Thu, 2013-06-13 at 15:21 -0400, RJ Ryan wrote: > > > > On Thu, Jun 13, 2013 at 1:50 AM, Daniel Schürmann > wrote: > Hi RJ > > >> If I understand

[Mixxx-devel] Getting rid of the 'mixxx' directory in the root of the repository.

2013-06-13 Thread RJ Ryan
Now that everyone is getting disrupted by the bzr to git switch, there's no time like now to get rid of the 'mixxx' folder inside the repository. I plan on just doing a git mv on all the contents of mixxx/*. Merges should still work fine as git can cope with files that have been modified in one bra

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

2013-06-13 Thread RJ Ryan
On Thu, Jun 13, 2013 at 1:50 AM, Daniel Schürmann wrote: > Hi RJ > > >> If I understand it right, git has user credentials per repository while > bzr has it per branch, we should deal with it. > > > Credentials aren't built into git -- if you have write access to the > repo then you can write to i

Re: [Mixxx-devel] Legacy git Mixxx repositories

2013-06-13 Thread RJ Ryan
I'll reach out to the owners and ask them to take them down. Not much else to do there I think... On Thu, Jun 13, 2013 at 2:09 AM, Daniel Schürmann wrote: > Hi Owen, > > Are previously mad git clones in track of our new repository? Or is there > a way to manage it with your scripts? > > https://

Re: [Mixxx-devel] Create XML file from Javascript automatically

2013-06-13 Thread Philip Whelan
The other mixco script also generated the XML file in the same way. On Sun, Jun 9, 2013 at 8:57 AM, wrote: > > Hello, > > inspired by the 'hate Javascript and XML' thread i updated a control > script so there is no need to manually create the XML file anymore. > > Basic idea is to define and co

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

2013-06-13 Thread Owen Williams
git-bzr-ng is the tool I use, but I also rewrite the history to unify usernames and email addresses. The script I use to do this is now in the scripts/ folder. Luckily the rewrite process is deterministic so every time I migrate a branch all of the SHAs line up nicely. On Thu, 2013-06-13 at 07:5

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

2013-06-13 Thread Max Linke
On Wed, 12 Jun 2013 17:51:44 -0400 RJ Ryan wrote: > Please clone the Mixxx GitHub repo and give it a try. If you have > never used Git before, there are tons of great resources for learning > out there. I've linked some of them at the bottom of > http://mixxx.org/wiki/doku.php/using_git http://p