From: Ilya Basin <basinilya@gmail.com>
To: git@vger.kernel.org
Subject: Re: git cvsexportcommit: error patch does not apply
Date: Sat, 4 Aug 2012 13:05:05 +0400 [thread overview]
Message-ID: <1029867674.20120804130505@gmail.com> (raw)
In-Reply-To: <999213645.20120803130555@gmail.com>
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.
--
prev parent reply other threads:[~2012-08-04 9:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-03 9:05 git cvsexportcommit: error patch does not apply Ilya Basin
2012-08-04 9:05 ` Ilya Basin [this message]
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=1029867674.20120804130505@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.