From: "Matt D." <matt@codespunk.com>
To: cygwin@cygwin.com
Subject: Re: Bug with Cygwin's 'quilt' is actually in 'patch'
Date: Thu, 20 Jun 2013 05:47:00 -0000 [thread overview]
Message-ID: <51C277A4.20709@codespunk.com> (raw)
In-Reply-To: <51BFF1F9.4040205@codespunk.com>
I've been looking further into this and it appears as though the problem
is in 'patch' not 'quilt'. quilt is actually a collection of bash
scripts and calls patch to do the actual patching.
Using the same example I provided earlier in the thread, the same error
occurs when calling patch directly:
$ patch Imakefile patches/test.patch
Running dos2unix on test.patch will allow the patch to apply
successfully. However, this is WRONG. Imakefile and the initially
created test.patch both use CRLF line endings. The patch should
definitely NOT apply by introducing actual disparity.
To summarize, the patch to Imakefile (CRLF) will apply if it is
converted to LF line endings. Using the '--binary' switch seems to be a
workaround for this issue.
On 6/18/2013 1:36 AM, Matt D. wrote:
> Built the latest source 0.60 (same version as Cygwin) from
> http://freecode.com/projects/quilt. Built on CentOS 6.4 and passes my
> previously provided test just fine.
>
> Downloaded the same source to Cygwin, rebuilt, replaced quilt in /bin;
> test still errors out. I also tried the latest cygwin1.dll snapshot;
> same problem.
>
>
> On 6/18/2013 1:09 AM, Matt D. wrote:
>> The last e-mail I supplied to the mailing list was missing the link to
>> the example. See this one for the link.
>>
>> ---
>>
>> There seems to be a problem with Cygwin's quilt. This simple example
>> simply alters a #define from 'MESAGL' to 'NX_MESAGL'. That's it.
>>
>> New quilt created, ok.
>> New patch, ok.
>> Edit file, ok.
>> Refresh (create patch), ok.
>> Rollback changes, ok.
>> Reapply patch.. error:
>>
>> >>> quilt push
>> >>> Applying patch test.patch
>> >>> patching file Imakefile
>> >>> Hunk #1 FAILED at 2.
>> >>> 1 out of 1 hunk FAILED -- rejects in file Imakefile
>> >>> Patch test.patch does not apply (enforce with -f)
>>
>> http://codespunk.com/files/upload/cygwin_quilt_00.zip
>>
>> Extract to a directory, cd in, and run 'quilt push' to generate the
>> error.
>>
>>
>>
>> --
>> Problem reports: http://cygwin.com/problems.html
>> FAQ: http://cygwin.com/faq/
>> Documentation: http://cygwin.com/docs.html
>> Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple
>>
>>
>>
>
> --
> Problem reports: http://cygwin.com/problems.html
> FAQ: http://cygwin.com/faq/
> Documentation: http://cygwin.com/docs.html
> Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple
>
>
>
--
Problem reports: http://cygwin.com/problems.html
FAQ: http://cygwin.com/faq/
Documentation: http://cygwin.com/docs.html
Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple
next prev parent reply other threads:[~2013-06-20 3:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 5:37 Bug with Cygwin's 'quilt' Matt D.
2013-06-18 5:47 ` Matt D.
2013-06-20 5:47 ` Matt D. [this message]
2013-06-20 6:35 ` Bug with Cygwin's 'quilt' is actually in 'patch' Christopher Faylor
2013-06-20 7:44 ` Matt D.
2013-06-20 8:22 ` Corinna Vinschen
2013-06-21 12:15 ` Corinna Vinschen
2013-06-21 17:06 ` Matt D.
2013-07-03 3:05 Peter B.
2013-07-03 12:33 ` Corinna Vinschen
2013-07-03 13:07 ` Peter B.
2013-07-03 13:30 ` Corinna Vinschen
2013-07-03 15:35 ` Peter B.
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=51C277A4.20709@codespunk.com \
--to=matt@codespunk.com \
--cc=cygwin@cygwin.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).