From: Eli Zaretskii <eliz@gnu.org>
To: "João Távora" <joaotavora@gmail.com>
Cc: 20892-done@debbugs.gnu.org, monnier@iro.umontreal.ca
Subject: bug#20892: 25.0.50; Applying vc-diff hunks on CRLF tracked files
Date: Sat, 02 Apr 2016 17:27:20 +0300 [thread overview]
Message-ID: <837fggrsqf.fsf@gnu.org> (raw)
In-Reply-To: <CALDnm50_xLqGmQYZpUWMdryGgv_7CGo+9F8W92gSJ97vZMtajA@mail.gmail.com> (message from João Távora on Sat, 2 Apr 2016 14:42:48 +0100)
> From: João Távora <joaotavora@gmail.com>
> Date: Sat, 2 Apr 2016 14:42:48 +0100
> Cc: Stefan Monnier <monnier@iro.umontreal.ca>, 20892@debbugs.gnu.org
>
> 1. Sometime in June 2015, upgrade my emacs. vc-diff some CRLF file
>
> 2. "Cool, a new feature now makes it show precisely which chars were
> added and deleted even the CRs"
>
> 3. "Oh, but vc-apply-hunk stopped working, let's open bug 20892"
>
> 4. Discuss bug, argue that showing ^M is cool for when you really want
> to apply patches that add and remove just one or two of those.
>
> 5. Apply some reasonable fix to my config. Be side-tracked by
> dayjob. Lose interest in discussing the bug,
>
> 6. Eventually, realize 4 is silly and if you're mixing CRLF and
> non-CRLF line endings you've already lost.
>
> 7. Recently, March 2016, also realize that diacritics are also wrong
> in latin-1 files.
>
> 8. Decide to reevaluate situation, read some code and commit messages,
> and propose a new fix that makes the vc-diff buffer have the same
> encoding as the originating file, as apparently was intended.
> vc-apply-hunk is fixed, if I ever need to do something like 4
> I'll do it outside of emacs.
>
> I think you can close the bug.
Thanks, closing.
prev parent reply other threads:[~2016-04-02 14:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-24 11:29 bug#20892: 25.0.50; Applying vc-diff hunks on CRLF tracked files João Távora
2015-06-24 14:52 ` Stefan Monnier
2015-06-24 14:57 ` Eli Zaretskii
2015-06-25 13:54 ` João Távora
2015-06-25 14:41 ` Eli Zaretskii
2016-04-01 10:22 ` João Távora
2016-04-01 20:35 ` Eli Zaretskii
2016-04-01 22:51 ` João Távora
2016-04-02 9:31 ` Eli Zaretskii
2016-04-02 13:42 ` João Távora
2016-04-02 14:27 ` Eli Zaretskii [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=837fggrsqf.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=20892-done@debbugs.gnu.org \
--cc=joaotavora@gmail.com \
--cc=monnier@iro.umontreal.ca \
/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.