From: Stefan Monnier <monnier@iro.umontreal.ca>
To: 4451@emacsbugs.donarmstrong.com
Subject: bug#4451: 23.1; EOL problems with vc-diff and cygwin
Date: Sun, 27 Sep 2009 21:08:12 -0400 [thread overview]
Message-ID: <jwvhbunanpr.fsf-monnier+emacsbugreports@gnu.org> (raw)
In-Reply-To: <87pr9c6s7l.fsf@marauder.physik.uni-ulm.de> (Reiner Steib's message of "Sun, 27 Sep 2009 22:35:58 +0200")
>> One interesting thing is that his --binary output seems to indicate
>> that his file's revision 1.2 was using DOS-style EOLs wereas the
>> current version is using Unix-style EOLs. So maybe that has
>> something to do with the problem, indeed.
> All revisions of the XML file _should_ have Unix-style EOLs. I'm not
> 100% sure they have in the example I showed (I can't verify this
> before October, sorry). But I had the very same symptoms with
> different XML files.
The reason why I think your file had DOS-style EOLs on revision 1.2 is
that the --binary diff you showed had ^M^M^J on the "old text" and just
^M^J on the "new text".
>> Also, of course it may also depend on the CVS version used on the
>> repository's server.
> The repository is on a mounted Windows share.
Could it be that the RCS files accessed this way get an accidental
LF->CRLF conversion done by the network-file-system?
Seems pretty unlikely. But could you try and copy (part of) the
repository to a local directory and try the operation again, just to
rule out any funny business from this side?
> BTW, why does `=' (`cvs-mode-diff') from PCL-CVS mode handle EOLs
> different to VC?
Because cvs-mode-diff applies to several files and doesn't presume that
those files are probably currently visited in Emacs buffers, so it just
always relies on Emacs's auto-detection instead. Sometimes it works
well, but in general it's not as good as what VC does (typically diffs
involving iso-2022 files in a "latin" locale don't decode the iso-2022
encoding).
Stefan
next prev parent reply other threads:[~2009-09-28 1:08 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-16 18:08 bug#4451: 23.1; EOL problems with vc-diff and cygwin Reiner Steib
2009-09-16 20:56 ` Eli Zaretskii
2009-09-17 14:26 ` Reiner Steib
2009-09-17 16:35 ` Stefan Monnier
2009-09-17 17:22 ` Eli Zaretskii
2009-09-17 20:59 ` Stefan Monnier
2009-09-18 11:29 ` Reiner Steib
2009-09-24 17:00 ` Reiner Steib
2009-09-24 22:07 ` Stefan Monnier
2009-09-25 19:11 ` Eli Zaretskii
2009-09-26 8:27 ` Reiner Steib
2009-09-26 9:20 ` Eli Zaretskii
2009-09-27 0:36 ` Stefan Monnier
2009-09-27 7:38 ` Eli Zaretskii
2009-09-27 19:03 ` Stefan Monnier
2009-09-27 20:35 ` Reiner Steib
2009-09-28 1:08 ` Stefan Monnier [this message]
2009-10-05 16:07 ` Reiner Steib
2009-10-05 18:45 ` Stefan Monnier
2009-10-05 20:58 ` Eli Zaretskii
2010-07-15 7:22 ` Reiner Steib
2010-07-15 8:33 ` Eli Zaretskii
2010-07-16 6:51 ` Reiner Steib
2010-07-16 8:05 ` Andreas Schwab
2010-07-16 10:18 ` Eli Zaretskii
2010-07-19 7:23 ` Reiner Steib
2009-09-17 17:18 ` Eli Zaretskii
2009-09-18 11:31 ` Reiner Steib
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=jwvhbunanpr.fsf-monnier+emacsbugreports@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=4451@emacsbugs.donarmstrong.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.
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.