Forwarding to mixxx-devel since I think that's where it was intended to go...
Sean, how did you commit Robin's patch? Robin thinks (below) that you're supposed to use bzr pull or bzr merge, and I thought you were maybe supposed to use "bzr patch" to apply it. *scratches head* What did you use? Thanks, Albert ---------- Forwarded message ---------- From: Robin Sheat <[email protected]> Date: Thu, Apr 30, 2009 at 3:58 PM Subject: bzr stuff (was: Re: [Mixxx-devel] BEHRINGER BCD3000) To: Albert Santoni <[email protected]> On Friday 01 May 2009 08:54:51 you wrote: > Thanks for the patch Robin! I see Sean committed it to the 1.7 branch > earlier, though I'm not sure if he notified you. I did see that, although I don't think you did it quite right, Sean. The patch itself is fine, and for a pokey one-liner like this there's no cause for concern, but if the patch was applied using bzr's methods I would expect to see it appear as though you had merged my branch into the release, and it would be in its own commit. This matters more for something of significant size though. I think (and I haven't verified) that if I did a feature that had multiple commits, made a patch, sent it in, and it was applied using the bzr tools, you would see each of those commits and all the details in the release as they showed up in my branch. >From looking at the bzr docs, you'd use 'bzr pull' or 'bzr merge' on the patch to pull that in. -- Robin <[email protected]> JabberID: <[email protected]> http://www.kallisti.net.nz/blog ||| http://identi.ca/eythian PGP Key 0xA99CEB6D = 5957 6D23 8B16 EFAB FEF8 7175 14D3 6485 A99C EB6D
signature.asc
Description: PGP signature
------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________ Mixxx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mixxx-devel
