[PATCH] KMyMoney has move to git. Cleanup portage file by removing really old and obsolete versions.

[Ralf Habacker]

Am 15.11.2011 09:00, schrieb Cristian Oneț:
> 2011/11/15 Ralf Habacker<ralf.habacker at googlemail.com>:
>> Am 15.11.2011 00:59, schrieb Cristian Oneț:
>>> Hi,
>>>
>>> I've attached the patch that updates the KMyMoney repository in KDE on
>>> Windows
>>> portage.
>> thanks for the update. Unfortunally the patch do not apply.
>>
>> C:\kde\trunk\emerge>git am kmymoney.patch
>> Applying: KMyMoney has move to git. Cleanup portage file by removing really
>> old and obsolete versions.
>> c:/kde/trunk/emerge/.git/rebase-apply/patch:77: trailing whitespace.
>> self.svnTargets['gitHEAD'] = '[git]kde:kmymoney'
>> c:/kde/trunk/emerge/.git/rebase-apply/patch:78: trailing whitespace.
>> for ver in ['4.5.3', '4.6.0', '4.6.1']:
>> error: portage/extragear/kmymoney/kmymoney-4.6.1-20110918.py: does not exist
>> in index
>> Patch failed at 0001 KMyMoney has move to git. Cleanup portage file by
>> removing really old and obsolete versions.
>> When you have resolved this problem run "git am --resolved".
>> If you would prefer to skip this patch, instead run "git am --skip".
>> To restore the original branch and stop patching run "git am --abort".
>>
>>
>> According to
>> https://projects.kde.org/projects/kdesupport/emerge/repository/revisions/master/show/portage/extragear/kmymoney
>> there is no 4.6.1 related file
> That's right because the patch was created for kde-4.7.3 branch (that
> is used right now AFAIK), sorry I did not mention it.
Thanks for this pointer. I applied this the patch to the kde-4.7.3 branch.
I also tried to cherry-pick this patch into to master, which failed

C:\kde\trunk\emerge>git cherry-pick cd191a5980c823b5aff81022cb1d7d1a71755046
error: could not apply cd191a5... KMyMoney has move to git. Cleanup 
portage file by removing really old and obsolete versions.
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit -c cd191a5'

Looking at the history i saw, that there are several commits applied to 
kde-4.7.3 and not to master. I tried to apply them step by step but this 
fails.
Merging kde-4.7.3 into master fails too.

Ralf