{"thread":{"id":"31178","subject":"git cvsexportcommit: error patch does not apply","startedAt":"2012-08-03T09:05:55Z","lastAt":"2012-08-04T09:05:05Z","messageCount":2,"participants":["Ilya Basin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"196402","messageId":"999213645.20120803130555@gmail.com","threadId":"31178","inReplyTo":null,"subject":"git cvsexportcommit: error patch does not apply","fromName":"Ilya Basin","fromEmail":"basinilya@gmail.com","sentAt":"2012-08-03T09:05:55Z","receivedAt":"2012-08-03T09:05:55Z","isPatch":false,"sender":{"key":"basinilya@gmail.com","avatar":null},"body":"Hi. Here's what I'm trying to do:\n\nIn gitcvs:\n    [il@basin documentation]$ git mv SIC_SAP1_0_ADM_dv1_1.doc SIC_SAP1_0_ADM_dv1_2.doc\n    (edit the file)\n    [il@basin documentation]$ git commit ... SIC_SAP1_0_ADM_dv1_2.doc\n    ...\n    $ git log --stat -n 1\n    commit b04fa43c9f1374cf0ea5f9bf88024282414b0a0c\n    Date:   Wed Aug 1 12:50:53 2012 +0400\n    \n        SIC_SAP1_0_ADM_dv1_2.doc: connection_timeout\n    \n     documentation/SIC_SAP1_0_ADM_dv1_1.doc |  Bin 7383040 -> 0 bytes\n     documentation/SIC_SAP1_0_ADM_dv1_2.doc |  Bin 0 -> 7427584 bytes\n     2 files changed, 0 insertions(+), 0 deletions(-)\n\nOK So far\n\n    $ git cvsexportcommit -w ../../cvs/SAP -u -p -k -c b04fa43c9f1374cf0ea5f9bf88024282414b0a0c\n    Checking if patch will apply\n    cvs update: nothing known about `documentation/SIC_SAP1_0_ADM_dv1_2.doc'\n    cvs status: nothing known about `documentation/SIC_SAP1_0_ADM_dv1_2.doc'\n    Huh? Status 'Unknown' reported for unexpected file 'no file SIC_SAP1_0_ADM_dv1_2.doc'\n    Applying\n    error: the patch applies to 'documentation/SIC_SAP1_0_ADM_dv1_1.doc' (e0c6cf56bd58ce3b1a8b8e00bfd20f75f89110f7), which does not match the current contents.\n    error: documentation/SIC_SAP1_0_ADM_dv1_1.doc: patch does not apply\n    cannot patch at /usr/lib/git-core/git-cvsexportcommit line 333.\n\n    $ ls -l ../../cvs/SAP/documentation/SIC_SAP1_0_ADM_dv1_1.doc*\n    -rw-r--r-- 1 basin Users 7382325 Aug  3 12:32 ../../cvs/SAP/documentation/SIC_SAP1_0_ADM_dv1_1.doc\n    -rw-r--r-- 1 basin Users 7383040 Jun  9  2005 ../../cvs/SAP/documentation/SIC_SAP1_0_ADM_dv1_1.doc.orig\n\nI compared SIC_SAP1_0_ADM_dv1_1.doc.orig and the file from HEAD~1 .\nThey are equal. Why error?\n"},{"id":"196453","messageId":"1029867674.20120804130505@gmail.com","threadId":"31178","inReplyTo":"999213645.20120803130555@gmail.com","subject":"Re: git cvsexportcommit: error patch does not apply","fromName":"Ilya Basin","fromEmail":"basinilya@gmail.com","sentAt":"2012-08-04T09:05:05Z","receivedAt":"2012-08-04T09:05:05Z","isPatch":false,"sender":{"key":"basinilya@gmail.com","avatar":null},"body":"IB>     $ git cvsexportcommit -w ../../cvs/SAP -u -p -k -c b04fa43c9f1374cf0ea5f9bf88024282414b0a0c\nIB>     Checking if patch will apply\nIB>     cvs update: nothing known about `documentation/SIC_SAP1_0_ADM_dv1_2.doc'\nIB>     cvs status: nothing known about `documentation/SIC_SAP1_0_ADM_dv1_2.doc'\nIB>     Huh? Status 'Unknown' reported for unexpected file 'no file SIC_SAP1_0_ADM_dv1_2.doc'\nIB>     Applying\nIB>     error: the patch applies to 'documentation/SIC_SAP1_0_ADM_dv1_1.doc' (e0c6cf56bd58ce3b1a8b8e00bfd20f75f89110f7), which does not match the current contents.\nIB>     error: documentation/SIC_SAP1_0_ADM_dv1_1.doc: patch does not apply\nIB>     cannot patch at /usr/lib/git-core/git-cvsexportcommit line 333.\n\nRemoving '-k' helped. I think it's a bug.\n'-k' should not affect binary files.\n\n\n-- \n"}]}