From: Eli Zaretskii <eliz@gnu.org>
To: Reuben Thomas <rrt@sc3d.org>
Cc: mbork@mbork.pl, 18236@debbugs.gnu.org
Subject: bug#18236: diff-apply-hunk interacts poorly with line endings
Date: Wed, 17 Feb 2016 22:14:04 +0200 [thread overview]
Message-ID: <838u2jumb7.fsf@gnu.org> (raw)
In-Reply-To: <CAOnWdoghXgQKXCo3Wi5fe+TnhWSBvZ_Q37YvqqWBUHp4h7ouKA@mail.gmail.com> (message from Reuben Thomas on Wed, 17 Feb 2016 19:59:02 +0000)
> Date: Wed, 17 Feb 2016 19:59:02 +0000
> From: Reuben Thomas <rrt@sc3d.org>
> Cc: Marcin Borkowski <mbork@mbork.pl>, 18236@debbugs.gnu.org
>
> Is the recipe
>
> complete?
>
> Seems so.
>
>
> Also, does this happen on a Posix host or on a Windows box?
>
>
> On a GNU/Linux system.
>
>
> If the former, I won't expect each line in the patch file to end with
> a ^M, only the lines that came from the files being diffed.
>
>
> Sorry, I was imprecise. You're quite right, only the lines that come from the files being diffed end in ^M.
>
> However, the original problem remains, as stated: after applying the patch hunk, the patched lines of the
> resultant file "bar" end \r\r\n.
Doesn't happen on Windows. I will try on GNU/Linux and see what I
find there.
next prev parent reply other threads:[~2016-02-17 20:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-10 15:34 bug#18236: diff-apply-hunk interacts poorly with line endings Reuben Thomas
2016-02-17 15:35 ` Marcin Borkowski
2016-02-17 16:39 ` Eli Zaretskii
2016-02-17 19:59 ` Reuben Thomas
2016-02-17 20:14 ` Eli Zaretskii [this message]
2016-02-20 12:16 ` Eli Zaretskii
2016-02-20 12:32 ` Reuben Thomas
2016-02-20 12:50 ` Eli Zaretskii
2016-02-21 10:09 ` Marcin Borkowski
2016-02-21 15:56 ` Eli Zaretskii
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=838u2jumb7.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=18236@debbugs.gnu.org \
--cc=mbork@mbork.pl \
--cc=rrt@sc3d.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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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.