Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Juanma Barranquero]

On Mon, Jun 30, 2008 at 14:46, Juanma Barranquero <lekktu@gmail.com> wrote:

> @@ -524,7 +528,6 @@
>        * quail/cyrillic.el ("bulgarian-phonetic"): Docstring fixed.
>        Duplicate entry removed.
>        ("bulgarian-bds"): Docstring fixed.
> -
>  2003-10-06  Dave Love  <fx@gnu.org>

For a while now (at least three/four months, perhaps more) I've been
suffering this weird problem where, sometimes, commiting a ChangeLog
suddenly removes one or several blank lines from it.

The above change is one such example. AFAICS, the CRLF -> LF
conversion fails somehow, but only in a few cases; I mean, usually at
most two or three lines in a whole ChangeLog file are affected. For
example, after the problem above, if I visit the ChangeLog I see:

2004-01-22  Ognyan Kulev  <ogi@fmi.uni-sofia.bg>  (tiny change)^M
^M
	* quail/cyrillic.el ("bulgarian-phonetic"): Docstring fixed.^M
	Duplicate entry removed.^M
	("bulgarian-bds"): Docstring fixed.^M
^M2003-10-06  Dave Love  <fx@gnu.org>^M
^M
	* quail/latin-ltx.el: Several additions.^M

It's like one LF had gone missing.

I use CVSNT:

  C:\> cvs --version

  Concurrent Versions System (CVSNT) 2.5.03 (Scorpio) Build 2382 (client/server)

and, while that could be a factor, I haven't upgraded it in a long
while, so there's no reason it should fail now.

Has someone else seen this problem?

  Juanma

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Eli Zaretskii]

> Date: Mon, 30 Jun 2008 15:04:59 +0200
> From: "Juanma Barranquero" <lekktu@gmail.com>
> 
> The above change is one such example. AFAICS, the CRLF -> LF
> conversion fails somehow, but only in a few cases; I mean, usually at
> most two or three lines in a whole ChangeLog file are affected. For
> example, after the problem above, if I visit the ChangeLog I see:
> 
> 2004-01-22  Ognyan Kulev  <ogi@fmi.uni-sofia.bg>  (tiny change)^M
> ^M
> 	* quail/cyrillic.el ("bulgarian-phonetic"): Docstring fixed.^M
> 	Duplicate entry removed.^M
> 	("bulgarian-bds"): Docstring fixed.^M
> ^M2003-10-06  Dave Love  <fx@gnu.org>^M
> ^M
> 	* quail/latin-ltx.el: Several additions.^M
> 
> It's like one LF had gone missing.

Sounds like an off-by-one bug somewhere, on some buffer boundary.  But
I'm not sure I understand whether you think it's in Emacs or in CVSNT.

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Juanma Barranquero]

On Mon, Jun 30, 2008 at 21:46, Eli Zaretskii <eliz@gnu.org> wrote:

> Sounds like an off-by-one bug somewhere, on some buffer boundary.  But
> I'm not sure I understand whether you think it's in Emacs or in CVSNT.

I don't know. I'd say that it is in Emacs, because I haven't updated
CVSNT in a long time. But it is weird that it only seems to happen to
me.

  Juanma

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Eli Zaretskii]

> Date: Mon, 30 Jun 2008 22:41:40 +0200
> From: "Juanma Barranquero" <lekktu@gmail.com>
> Cc: emacs-devel@gnu.org
> 
> On Mon, Jun 30, 2008 at 21:46, Eli Zaretskii <eliz@gnu.org> wrote:
> 
> > Sounds like an off-by-one bug somewhere, on some buffer boundary.  But
> > I'm not sure I understand whether you think it's in Emacs or in CVSNT.
> 
> I don't know. I'd say that it is in Emacs, because I haven't updated
> CVSNT in a long time. But it is weird that it only seems to happen to
> me.

I always use "cvs up -kb", and I don't edit ChangeLog's for fixing
past entries.  That might explain why it never happened to me.

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Juanma Barranquero]

On Tue, Jul 1, 2008 at 05:02, Eli Zaretskii <eliz@gnu.org> wrote:

> I always use "cvs up -kb"

Well, that would make a difference, because then the ChangeLog is sent
entirely, isn't it?

> and I don't edit ChangeLog's for fixing past entries.

The problem is not related to fixing past entries. It has happened to
me many times when just adding a new entry.

   Juanma

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Eli Zaretskii]

> Date: Tue, 1 Jul 2008 05:12:29 +0200
> From: "Juanma Barranquero" <lekktu@gmail.com>
> Cc: emacs-devel@gnu.org
> 
> On Tue, Jul 1, 2008 at 05:02, Eli Zaretskii <eliz@gnu.org> wrote:
> 
> > I always use "cvs up -kb"
> 
> Well, that would make a difference, because then the ChangeLog is sent
> entirely, isn't it?

Yes.

Are you saying that the problem happens when "cvs up" applies the
patches sent to it by the server?

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Juanma Barranquero]

On Fri, Jul 4, 2008 at 11:56, Eli Zaretskii <eliz@gnu.org> wrote:

> Are you saying that the problem happens when "cvs up" applies the
> patches sent to it by the server?

Really, I don't know.

The sequence is this:

 - I have a ChangeLog, apparently correct, up-to-date with the repository.
 - I modify it, typically by adding a new ChangeLog entry.
 - I commit in from inside Emacs, with vc-next-action followed by log-edit-done.
 - I see the diff in emacs-diffs and notice that an empty line has
been deleted. This seems to happen more to empty lines that separate
paragraphs from date/author lines (as opposed to empty space between
paragraphs), but I have no hard data, just a feeling.
 - I edit the ChangeLog to see what's happened. All the lines end in ^M.
 - I remove the ^M (with replace-string <ENTER> ^M^J <ENTER> ^J) [I
don't write the ChangeLog, it's just to make it easier spot problems.]
 - At that point (after removing the ^Ms) the line with the problem
has this aspect:

        this is the last line of the previous paragraph.
^MYYYY-MM-DD  This is the  <author@line>

        * This is the correct paragraph of the following entry.


Juanma

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Jason Rumney]

Juanma Barranquero wrote:
> On Fri, Jul 4, 2008 at 11:56, Eli Zaretskii <eliz@gnu.org> wrote:
> 
>> Are you saying that the problem happens when "cvs up" applies the
>> patches sent to it by the server?
> 
> Really, I don't know.
> 
> The sequence is this:
> 
>  - I have a ChangeLog, apparently correct, up-to-date with the repository.
>  - I modify it, typically by adding a new ChangeLog entry.
>  - I commit in from inside Emacs, with vc-next-action followed by log-edit-done.
>  - I see the diff in emacs-diffs and notice that an empty line has
> been deleted. This seems to happen more to empty lines that separate
> paragraphs from date/author lines (as opposed to empty space between
> paragraphs), but I have no hard data, just a feeling.

I have just had something similar happen. An extra ^M was inserted at
the start of a line well down the ChangeLog file somewhere in the process.

In my case, Emacs prompted me to revert ChangeLog after a CVS update and
before adding my ChangeLog entry.

Everything looked fine until I next reopened ChangeLog, where the line
end inconsistency caused the ^Ms to show up. The problem could have
happened at any of these points, but I suspect the second, as that is
the only one that is not part of my normal everyday use of CVS:

1. cvs update (file was unmodified locally at that time)
2. revert-buffer
3. add-change-log-entry
4. vc-next-action from vc-dired window with modified ChangeLog and one
other file marked.
5. cvs commit (resulting from step 4).

Because the ^M is treated specially by CVS, I'm unable to check in a
corrected version without making some other change to the file.

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Juanma Barranquero]

On Tue, Jul 22, 2008 at 17:42, Jason Rumney <jasonr@gnu.org> wrote:

> I have just had something similar happen. An extra ^M was inserted at
> the start of a line well down the ChangeLog file somewhere in the process.

Yes! I just watched the diff pass by. Great.

> Everything looked fine until I next reopened ChangeLog, where the line
> end inconsistency caused the ^Ms to show up. The problem could have
> happened at any of these points, but I suspect the second, as that is
> the only one that is not part of my normal everyday use of CVS:

Hmm. It's highly likely that the same happened in my case(s) and I
just didn't notice.

> Because the ^M is treated specially by CVS, I'm unable to check in a
> corrected version without making some other change to the file.

I've checked in a fixed ChangeLog.

  Juanma

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Jason Rumney]

Jason Rumney wrote:
> Juanma Barranquero wrote:

>>  - I see the diff in emacs-diffs and notice that an empty line has
>> been deleted. This seems to happen more to empty lines that separate
>> paragraphs from date/author lines (as opposed to empty space between
>> paragraphs), but I have no hard data, just a feeling.
> 
> I have just had something similar happen. An extra ^M was inserted at
> the start of a line well down the ChangeLog file somewhere in the process.

Actually the problem seems to be exactly as you stated, a ^J was removed
from a blank line (the misplaced ^M was left over, not added).

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Juanma Barranquero]

On Tue, Jul 22, 2008 at 17:55, Jason Rumney <jasonr@gnu.org> wrote:

> Actually the problem seems to be exactly as you stated, a ^J was removed
> from a blank line (the misplaced ^M was left over, not added).

It just happened again, and this time I'm sure there was no
revert-buffer involved:


@@ -504,7 +509,6 @@
       * gnus-news.texi: Mention gnus-article-wide-reply-with-original.

 2008-01-18  Carsten Dominik  <dominik@science.uva.nl>
-
       * org.texi (Property inheritance): New section.
       (Conventions): New section.
       (Structure editing): Document C-RET, the prefix arg to the cut/copy


  Juanma

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Juanma Barranquero]

Another case with no revert-buffer:

@@ -11415,7 +11423,6 @@

       * diff-mode.el (diff-add-change-log-entries-other-window): Avoid the
       splitter in context hunks.
-
 2008-02-08  Kenichi Handa  <handa@ni.aist.go.jp>

  Juanma

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Eli Zaretskii]

> Date: Fri, 25 Jul 2008 18:06:21 +0200
> From: "Juanma Barranquero" <lekktu@gmail.com>
> Cc: "Eli Zaretskii" <eliz@gnu.org>, emacs-devel@gnu.org
> 
> Another case with no revert-buffer:
> 
> @@ -11415,7 +11423,6 @@
> 
>        * diff-mode.el (diff-add-change-log-entries-other-window): Avoid the
>        splitter in context hunks.
> -
>  2008-02-08  Kenichi Handa  <handa@ni.aist.go.jp>

How about setting up a before-change-functions hook which would catch
such changes to a ChangeLog buffers and announce them?

Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v

[Juanma Barranquero]

On Sat, Jul 26, 2008 at 08:12, Eli Zaretskii <eliz@gnu.org> wrote:

> How about setting up a before-change-functions hook which would catch
> such changes to a ChangeLog buffers and announce them?

Yes, good idea. I'll do that.

   Juanma