Merge or Cherry-Pick?

[Pino Toscano]

Alle mercoledì 2 febbraio 2011, Dawit A ha scritto:
> Would someone be so kind to tell me how to undo accidentally pushed
> commits to trunk ?

$ git revert SHA

> http://quickgit.kde.org/?p=kdelibs.git&a=commit&h=449d49908ce610d9af
> 4e8e3da89466f168f66bc3

This commit, which is your "fix" for the share-mime-info version, is 
simply wrong, even for the 4.6 branch:
- nothing guarantees you opening the executable directly allows you to 
find the string directly
- nothing guarantees you that the string you want to find is actually 
there: other tha the fact that the executable could output the version 
string in bits, update-mime-database could be even a python/perl/rub/etc 
script
- nothing guarantees you that the update-mime-database in PATH is the 
real executable oing the job: in debian/ubuntu/etc, `update-mime-
database' is a shell script that avoid the mimetype regeneration during 
packages updates (leaving such job being run once at the end of the 
installation phase -- i.e. dpkg triggers), while leaving a direct 
invocation working as usual; this means your commit would have break 
support in debian/ubuntu

Please discuss the solution in this ml, before commit it, thanks.

-- 
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20110202/1f09d990/attachment.sig>