From: Ilya Basin <basinilya@gmail.com>
To: git@vger.kernel.org
Subject: git cvsexportcommit: error patch does not apply
Date: Fri, 3 Aug 2012 13:05:55 +0400 [thread overview]
Message-ID: <999213645.20120803130555@gmail.com> (raw)
Hi. Here's what I'm trying to do:
In gitcvs:
[il@basin documentation]$ git mv SIC_SAP1_0_ADM_dv1_1.doc SIC_SAP1_0_ADM_dv1_2.doc
(edit the file)
[il@basin documentation]$ git commit ... SIC_SAP1_0_ADM_dv1_2.doc
...
$ git log --stat -n 1
commit b04fa43c9f1374cf0ea5f9bf88024282414b0a0c
Date: Wed Aug 1 12:50:53 2012 +0400
SIC_SAP1_0_ADM_dv1_2.doc: connection_timeout
documentation/SIC_SAP1_0_ADM_dv1_1.doc | Bin 7383040 -> 0 bytes
documentation/SIC_SAP1_0_ADM_dv1_2.doc | Bin 0 -> 7427584 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
OK So far
$ git cvsexportcommit -w ../../cvs/SAP -u -p -k -c b04fa43c9f1374cf0ea5f9bf88024282414b0a0c
Checking if patch will apply
cvs update: nothing known about `documentation/SIC_SAP1_0_ADM_dv1_2.doc'
cvs status: nothing known about `documentation/SIC_SAP1_0_ADM_dv1_2.doc'
Huh? Status 'Unknown' reported for unexpected file 'no file SIC_SAP1_0_ADM_dv1_2.doc'
Applying
error: the patch applies to 'documentation/SIC_SAP1_0_ADM_dv1_1.doc' (e0c6cf56bd58ce3b1a8b8e00bfd20f75f89110f7), which does not match the current contents.
error: documentation/SIC_SAP1_0_ADM_dv1_1.doc: patch does not apply
cannot patch at /usr/lib/git-core/git-cvsexportcommit line 333.
$ ls -l ../../cvs/SAP/documentation/SIC_SAP1_0_ADM_dv1_1.doc*
-rw-r--r-- 1 basin Users 7382325 Aug 3 12:32 ../../cvs/SAP/documentation/SIC_SAP1_0_ADM_dv1_1.doc
-rw-r--r-- 1 basin Users 7383040 Jun 9 2005 ../../cvs/SAP/documentation/SIC_SAP1_0_ADM_dv1_1.doc.orig
I compared SIC_SAP1_0_ADM_dv1_1.doc.orig and the file from HEAD~1 .
They are equal. Why error?
next reply other threads:[~2012-08-03 9:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-03 9:05 Ilya Basin [this message]
2012-08-04 9:05 ` git cvsexportcommit: error patch does not apply Ilya Basin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=999213645.20120803130555@gmail.com \
--to=basinilya@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).