Hi Maxime, you have branched lp:mixxx/1.10 and proposed for merging to lp:mixxx so your changes are displayed and the difference between lp:mixxx/1.10 and lp:mixxx. Please propose merging back to lp:mixxx/1.10.
For me it is too time-consuming to make a branch for a bug that effects only a few files. I do publishing most of my work using patches. Simply type to the command line: bzr diff > mypatch.patch now you can attache your patch to the bug and hope that someone from the Mixxx Development Team will use it in lp:mixxx After that you may type: bzr revert to undo your changes and solve the next bug ;-) I use branches for big changes where I need the power of bzr during the development and I have my personal trunk to use all my patches. Regards, Daniel -------- Original-Nachricht -------- > Datum: Thu, 1 Mar 2012 14:28:09 +0100 > Von: Maxime Bochon <[email protected]> > An: [email protected] > Betreff: [Mixxx-devel] A bit confused about my first bug fix > Hi everyone, > > My first bug fix (1) was submitted yesterday and I would like to clarify > something about the merging in progress. Actually this is my first > contribution to an open source project so any advice is welcome ;-) > > The procedure described on the wiki (2) helped me to get familiar with how > to submit my code change. So I: > 1. branched locally from the last stable version of mixxx (1.10) > 2. committed my changes on 'mixxx/src/dlgprefmidibindings.cpp' (only one > file was changed) > 3. created a new branch called 'bug801096' to my launchpad account > 4. proposed that branch for merging > > Thanks to Jus, the proposal for merging now appear on the bug page (3), > but > 9 file changes are mentioned instead of 1. It seems that revisions made by > others on the 1.10 branch are taken into account so it makes it a bit > confusing. What is the proper way to troubleshoot this? > > Regards, > > Maxime Bochon > > > (1) http://code.launchpad.net/~maxime-bochon/mixxx/bug801096 > (2) > http://mixxx.org/wiki/doku.php/using_bazaar#general_procedure_for_distributed_use > (3) http://bugs.launchpad.net/mixxx/+bug/801096 -- NEU: FreePhone 3-fach-Flat mit kostenlosem Smartphone! Jetzt informieren: http://mobile.1und1.de/?ac=OM.PW.PW003K20328T7073a ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Mixxx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mixxx-devel
