Mixxx

I'm up for it but give me until Thursday. I've got Theremins to build
and runtimes to prove.

On 19/05/2009, Albert Santoni <alberts@...> wrote:
> Hi guys,
>
> I've had several minor panic attacks over the ~vcs-imports/mixxx/trunk
> and lp:mixxx branches in BZR, trying to figure out how we shut down
> SVN for good. Turns out that was unwarranted, all we need to do is
> merge the ~vcs-imports/mixxx/trunk branch into the lp:mixxx branch.
> The vcs-imports one is a mirror of our SVN trunk on SourceForge, and
> the lp:mixxx one is a snapshot of trunk from many weeks ago. Merging
> the ~vcs-imports branch into the lp:mixxx one should make lp:mixxx our
> trunk, and will allow us to disable SVN commits to SourceForge.
>
> So who wants to do some merging?
>
> Thanks,
> Albert
>
> P.S. After lp:mixxx is officially our "trunk", we still won't merge
> the 1.7 branch into it until 1.7.0 is released (*cough* Sean *cough*).
> The above merge doesn't affect 1.7 in any way.
>
> ------------------------------------------------------------------------------
> Crystal Reports - New Free Runtime and 30 Day Trial
> Check out the new simplified licensing option that enables
> unlimited royalty-free distribution of the report engine
> for externally facing server and web deployment.
> http://p.sf.net/sfu/businessobjects
> _______________________________________________
> Mixxx-devel mailing list
> Mixxx-devel@...
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>

Great, thanks Nick!

Albert

On Tue, May 19, 2009 at 3:35 PM, Nick Guenther <kousue@...> wrote:
> I'm up for it but give me until Thursday. I've got Theremins to build
> and runtimes to prove.
>
> On 19/05/2009, Albert Santoni <alberts@...> wrote:
>> Hi guys,
>>
>> I've had several minor panic attacks over the ~vcs-imports/mixxx/trunk
>> and lp:mixxx branches in BZR, trying to figure out how we shut down
>> SVN for good. Turns out that was unwarranted, all we need to do is
>> merge the ~vcs-imports/mixxx/trunk branch into the lp:mixxx branch.
>> The vcs-imports one is a mirror of our SVN trunk on SourceForge, and
>> the lp:mixxx one is a snapshot of trunk from many weeks ago. Merging
>> the ~vcs-imports branch into the lp:mixxx one should make lp:mixxx our
>> trunk, and will allow us to disable SVN commits to SourceForge.
>>
>> So who wants to do some merging?
>>
>> Thanks,
>> Albert
>>
>> P.S. After lp:mixxx is officially our "trunk", we still won't merge
>> the 1.7 branch into it until 1.7.0 is released (*cough* Sean *cough*).
>> The above merge doesn't affect 1.7 in any way.
>>
>> ------------------------------------------------------------------------------
>> Crystal Reports - New Free Runtime and 30 Day Trial
>> Check out the new simplified licensing option that enables
>> unlimited royalty-free distribution of the report engine
>> for externally facing server and web deployment.
>> http://p.sf.net/sfu/businessobjects
>> _______________________________________________
>> Mixxx-devel mailing list
>> Mixxx-devel@...
>> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>>
>

On Wednesday 20 May 2009 10:35:41 Nick Guenther wrote:
> I'm up for it but give me until Thursday. I've got Theremins to build

When you're done with that, you can experiment with having a MIDI theremin as 
input to Mixxx.

What could possibly go wrong? :)

-- 
Robin <robin@...> JabberID: <eythian@...>
http://www.kallisti.net.nz/blog       |||       http://identi.ca/eythian

PGP Key 0xA99CEB6D = 5957 6D23 8B16 EFAB FEF8  7175 14D3 6485 A99C EB6D

This actually has crossed my mind. The guy teaching us all how to
solder claims that analog->midi interconnects are dirt cheap.

On 20/05/2009, Robin Sheat <robin@...> wrote:
> On Wednesday 20 May 2009 10:35:41 Nick Guenther wrote:
>> I'm up for it but give me until Thursday. I've got Theremins to build
>
> When you're done with that, you can experiment with having a MIDI theremin
> as
> input to Mixxx.
>
> What could possibly go wrong? :)
>
> --
> Robin <robin@...> JabberID: <eythian@...>
> http://www.kallisti.net.nz/blog       |||       http://identi.ca/eythian
>
> PGP Key 0xA99CEB6D = 5957 6D23 8B16 EFAB FEF8  7175 14D3 6485 A99C EB6D
>
>

Okay so lp:mixxx has merged all the few remaining changes that were in
SVN and we can disable svn, but what *is* lp:mixxx? Is it trunk? If
it's trunk, what is lp:mixxx/1.7 (where we've been working)? Are we
going to merge lp:mixxx and lp:mixxx/1.7 at some point?

-Nick

Nick Guenther wrote:
> Okay so lp:mixxx has merged all the few remaining changes that were in
> SVN and we can disable svn, but what *is* lp:mixxx? Is it trunk? If
> it's trunk, what is lp:mixxx/1.7 (where we've been working)? Are we
> going to merge lp:mixxx and lp:mixxx/1.7 at some point?

lp:mixxx is indeed trunk
lp:mixxx/1.7 is the 1.7 series bug fix release branch

After 1.7.0 gold is released, we will merge changes from the 1.7 branch
to trunk, leaving the 1.7 branch to continue to receive bug fixes. (We
should have been doing so all along, but anyway...) So perhaps "merge"
isn't the right terminology for that operation. Copy-merge?

Sean

<<--------------------------------------------------------------------------------->>
This E-Mail message has been scanned for viruses
and cleared by >>SmartMail<< from Smarter Technology, Inc.
<<--------------------------------------------------------------------------------->>