iPod collection rewrite merge considerations

[Bart Cerneels]

On Sat, Apr 14, 2012 at 14:31, Teo Mrnjavac <teo at kde.org> wrote:
> On Sat, Apr 14, 2012 at 13:35, Matěj Laitl <matej at laitl.cz> wrote:
>> Hi list and mainly Bart,
>> the iPod collection rewrite that I've been doing since December has reached
>> the merge-ready state. It has no known regressions or feature omissions wrt
>> the old plugin and fixes at least 6 b.k.o. bugs. It has been working fine for me
>> and Santiago (who volunteered to test it) for months on 4 different iPod
>> models.
>>
>> I haven't touched the old plugin and develop the new in a separate
>> ipodcollectionnew directory, both plugins are built by default, one of them
>> has to be disabled in Amarok config to prevent clashes. This is fine for
>> development, but impractical once it is merged. There are several options for
>> the merge:
>>
>> a) just drop ipodcollection in one commit and add ipodcollectionnew in second
>> commit. People who have disabled iPod collection plugin will have the new one
>> enabled.
>> b) drop ipodcollection in one commit and add ipodcollectionnew renamed back to
>> ipodcollection in second commit. Transparent to user.
>> c) drop ipodcollection and add ipodcollectionnew renamed back to
>> ipodcollection in one big commit. I'm against this because the old and new one
>> have nothing in common and the diff will look horrible.
>
> I'd obviously defer the final call to you and Bart, but I think
> transparency to users is very important, so I'd go with (b).
>
> Cheers,
> --


I agree. B is the best option.