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

[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. I don't know how
you guys manage with merges between different branches if the
filenames differ on each of them.

Regards,
Cristian

> Ralf
>
> _______________________________________________
> Kde-windows mailing list
> Kde-windows at kde.org
> https://mail.kde.org/mailman/listinfo/kde-windows
>