Hi Maxime,
I was going to respond on the bug report but I'll respond here. The reason
those extra diffs showed up is indeed because those changes haven't been
merged from the 1.10 branch into trunk yet. That said, since you're fixing
a bug that's present in the 1.10 branch as well we'd like to fix it in that
branch in case we release version 1.10.1. Could you request a merge into
lp:mixxx/1.10 instead of lp:mixxx?
Thanks!
RJ Ryan
On Thu, Mar 1, 2012 at 8:28 AM, Maxime Bochon <[email protected]>wrote:
> 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
>
>
>
> ------------------------------------------------------------------------------
> 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
>
>
------------------------------------------------------------------------------
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
