From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Juanma Barranquero" Newsgroups: gmane.emacs.bugs Subject: bug#870: Missing ^J in ChangeLog Date: Wed, 22 Oct 2008 17:14:27 +0200 Message-ID: References: <48BE8823.4030103@gmx.at> Reply-To: Juanma Barranquero , 870@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1224689499 6706 80.91.229.12 (22 Oct 2008 15:31:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 22 Oct 2008 15:31:39 +0000 (UTC) To: 870@emacsbugs.donarmstrong.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Oct 22 17:32:40 2008 connect(): Connection refused Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KsfhO-0008O7-2G for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Oct 2008 17:32:38 +0200 Original-Received: from localhost ([127.0.0.1]:45679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KsfgH-0006Eg-Sn for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Oct 2008 11:31:29 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KsfgE-0006E8-Du for bug-gnu-emacs@gnu.org; Wed, 22 Oct 2008 11:31:26 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KsfgB-0006Dl-SL for bug-gnu-emacs@gnu.org; Wed, 22 Oct 2008 11:31:26 -0400 Original-Received: from [199.232.76.173] (port=55144 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KsfgB-0006Di-LS for bug-gnu-emacs@gnu.org; Wed, 22 Oct 2008 11:31:23 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:60829) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Ksfg4-0003LX-0K; Wed, 22 Oct 2008 11:31:17 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m9MFU1u6021371; Wed, 22 Oct 2008 08:30:02 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m9MFK2nt019082; Wed, 22 Oct 2008 08:20:02 -0700 X-Loop: don@donarmstrong.com Resent-From: "Juanma Barranquero" Resent-To: bug-submit-list@donarmstrong.com Resent-CC: eliz@gnu.org, jasonr@gnu.org, Emacs Bugs , don@donarmstrong.com Resent-Date: Wed, 22 Oct 2008 15:20:02 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 870 X-Emacs-PR-Package: emacs,w32 X-Emacs-PR-Keywords: Original-Received: via spool by 870-submit@emacsbugs.donarmstrong.com id=B870.122468847717880 (code B ref 870); Wed, 22 Oct 2008 15:20:02 +0000 Original-Received: (at 870) by emacsbugs.donarmstrong.com; 22 Oct 2008 15:14:37 +0000 Original-Received: from mail-gx0-f19.google.com (mail-gx0-f19.google.com [209.85.217.19]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m9MFEXE3017872 for <870@emacsbugs.donarmstrong.com>; Wed, 22 Oct 2008 08:14:35 -0700 Original-Received: by gxk12 with SMTP id 12so7632456gxk.1 for <870@emacsbugs.donarmstrong.com>; Wed, 22 Oct 2008 08:14:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=of7iti/SikREnFxkwqLOGYOPpAPM0CglNbrYuORjYhs=; b=XUUqeCBw7DyQfK8pMUJuMW1U0ywW6SW6URE+Sw2kuqCRKseMccuyaqjLeEbXY6v9wg 7EQpjOxWW2gp86F1digifCNlyhtWPeItp2GwdDstB+ekRc19NCPwIvcBBHtBJx1qE7y9 BmWRGy6TbEDYEOeFZo8874/R2q4zSdaLMJ0nY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=Y5nvTkcepg2D3NLRb+KGf0YMYK8TQPttykucT9zO5Uwh9HFOriROFzAq4zEwMTHKDO JEEVJOfzk+efEoJRt1W0kCnoPWdAnHOlTvpC7roAcctuJqHY6A3D4g8VE4gHmWxBthvd nsIYzk9rJMSF01VpmYE8av2ti0wm0KOfEjplE= Original-Received: by 10.100.207.14 with SMTP id e14mr11839042ang.60.1224688467394; Wed, 22 Oct 2008 08:14:27 -0700 (PDT) Original-Received: by 10.100.13.13 with HTTP; Wed, 22 Oct 2008 08:14:27 -0700 (PDT) In-Reply-To: Content-Disposition: inline X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Wed, 22 Oct 2008 11:31:26 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:21786 Archived-At: X-Debbugs-CC: eliz@gnu.org, jasonr@gnu.org I just had it happen to me again, after a long while. Those were my steps: 1.- Edit and save src/xdisp.c. 2.- Edit and save src/ChangeLog to add a new entry. 3.- Run vc-dir (through C-x v d) and select to check only on "src/"; vc-dir says there are pending changes in src/ChangeLog (among other files). 4.- Exit Emacs. 5.- cvs update from the checkout root; src/ChangeLog is merged. There are no conflicts (my change to src/ChangeLog was not at the top of the file because, before merging, the first entry was already by me). 6.- Enter Emacs (it visits src/ChangeLog because I'm using desktop.el). 7.- Split the second entry (by me) in two, moving part of it as a new entry at the top of src/ChangeLog. 8.- Save src/ChangeLog. 9.- Run vc-dir again; there are files ready to be commited. 10.- Mark them with M (vc-dir-mark-all-files) and commit them with v (vc-next-action). 11.- Fill the CVS log entry and send with C-c C-c. I'm puzzled. I'd think CVSNT was screwing with CRLF, but after 5) the ChangeLog was fine, or I would have seen it at 6). Juanma