unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Jason Rumney <jasonr@gnu.org>
To: Juanma Barranquero <lekktu@gmail.com>
Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] Changes to emacs/leim/ChangeLog,v
Date: Tue, 22 Jul 2008 16:42:39 +0100	[thread overview]
Message-ID: <4885FFEF.9000409@gnu.org> (raw)
In-Reply-To: <f7ccd24b0807040450l5d3c3cbfgbeb35007c8160d32@mail.gmail.com>

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.





  reply	other threads:[~2008-07-22 15:42 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <E1KDIlu-0000Ot-Ez@cvs.savannah.gnu.org>
2008-06-30 13:04 ` [Emacs-diffs] Changes to emacs/leim/ChangeLog,v Juanma Barranquero
2008-06-30 19:46   ` Eli Zaretskii
2008-06-30 20:41     ` Juanma Barranquero
2008-07-01  3:02       ` Eli Zaretskii
2008-07-01  3:12         ` Juanma Barranquero
2008-07-04  9:56           ` Eli Zaretskii
2008-07-04 11:50             ` Juanma Barranquero
2008-07-22 15:42               ` Jason Rumney [this message]
2008-07-22 15:51                 ` Juanma Barranquero
2008-07-22 15:55                 ` Jason Rumney
2008-07-23  8:45                   ` Juanma Barranquero
2008-07-25 16:06                     ` Juanma Barranquero
2008-07-26  6:12                       ` Eli Zaretskii
2008-07-26 10:18                         ` Juanma Barranquero

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

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4885FFEF.9000409@gnu.org \
    --to=jasonr@gnu.org \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=lekktu@gmail.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 public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

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).