Subject: Re: git cvsexportcommit: error patch does not apply

From: Ilya Basin <[email-masked]>
Date: Sat, 4 Aug 2012 13:05:05 +0400

IB>     $ git cvsexportcommit -w ../../cvs/SAP -u -p -k -c b04fa43c9f1374cf0ea5f9bf88024282414b0a0c
IB>     Checking if patch will apply
IB>     cvs update: nothing known about `documentation/SIC_SAP1_0_ADM_dv1_2.doc'
IB>     cvs status: nothing known about `documentation/SIC_SAP1_0_ADM_dv1_2.doc'
IB>     Huh? Status 'Unknown' reported for unexpected file 'no file SIC_SAP1_0_ADM_dv1_2.doc'
IB>     Applying
IB>     error: the patch applies to 'documentation/SIC_SAP1_0_ADM_dv1_1.doc' (e0c6cf56bd58ce3b1a8b8e00bfd20f75f89110f7), which does not match the current contents.
IB>     error: documentation/SIC_SAP1_0_ADM_dv1_1.doc: patch does not apply
IB>     cannot patch at /usr/lib/git-core/git-cvsexportcommit line 333.

Removing '-k' helped. I think it's a bug.
'-k' should not affect binary files.

--