From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jim Meyering Newsgroups: gmane.emacs.devel Subject: Re: corrupted ,v files break cvs-to-git mirror Date: Thu, 30 Aug 2007 09:25:32 +0200 Message-ID: <87d4x5pjpv.fsf@rho.meyering.net> References: <87lkburb7q.fsf@rho.meyering.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1188459035 19980 80.91.229.12 (30 Aug 2007 07:30:35 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 30 Aug 2007 07:30:35 +0000 (UTC) Cc: emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 30 09:30:33 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IQeU4-0006ZQ-09 for ged-emacs-devel@m.gmane.org; Thu, 30 Aug 2007 09:30:32 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IQeU3-0003rV-LC for ged-emacs-devel@m.gmane.org; Thu, 30 Aug 2007 03:30:31 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IQePM-0007sP-Ux for emacs-devel@gnu.org; Thu, 30 Aug 2007 03:25:40 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IQePL-0007rT-D2 for emacs-devel@gnu.org; Thu, 30 Aug 2007 03:25:40 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IQePL-0007rP-1n for emacs-devel@gnu.org; Thu, 30 Aug 2007 03:25:39 -0400 Original-Received: from smtp3-g19.free.fr ([212.27.42.29]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IQePG-0000Lw-OR; Thu, 30 Aug 2007 03:25:34 -0400 Original-Received: from smtp3-g19.free.fr (localhost.localdomain [127.0.0.1]) by smtp3-g19.free.fr (Postfix) with ESMTP id 0AEA859EA5; Thu, 30 Aug 2007 09:25:34 +0200 (CEST) Original-Received: from mx.meyering.net (mx.meyering.net [82.230.74.64]) by smtp3-g19.free.fr (Postfix) with ESMTP id E6DBE8658; Thu, 30 Aug 2007 09:25:33 +0200 (CEST) Original-Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000) id 0E82928EFB; Thu, 30 Aug 2007 09:25:33 +0200 (CEST) In-Reply-To: (Miles Bader's message of "Wed\, 29 Aug 2007 17\:39\:33 +0900") Original-Lines: 42 X-Detected-Kernel: Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:77402 Archived-At: Miles Bader wrote: > Jim Meyering writes: >> Does anyone here have any idea how that happened? >> FYI, here's the second "1.1" log entry, from "cvs log" output: >> [What does "Moved" mean? ] >> >> ---------------------------- >> revision 1.1 >> date: 2005/08/23 20:05:32; author: jhd; state: Exp; >> Moved from international. Old log: >> ;;; swedish.el --- miscellaneous functions for dealing with Swedish. >> ---------------------------- >> revision 1.12 >> date: 2005/07/04 17:22:27; author: lute; state: Exp; lines: +2 -2 >> Update FSF's address. >> ---------------------------- >> >> I hope it's easily fixed. > > It looks as if the stuff past "Moved old log:" are _not_ actual CVS > revisions, but all part of the _log message_ for revision 1.1 -- i.e., > the person who did the "move" just copied the entire CVS log of from the > old location verbatim, and stuffed into his log entry. Yep. I should have looked directly at the ,v file. > So if that's the case probably CVS isn't confused, because it should do > proper escaping of log messages, but any tools which try to parse the > output of "cvs log" will be very confused (as I guess your tool was). Yes. For cvsps to do its job properly, it would need an rlog-style log-listing tool, with an option to produce unambiguous (i.e., NUL-separated) blocks of per-revision data. > I guess you can fix it just by giving revision 1.1 a differnt log > message without all the annoying stuff (using "cvs admin -m..."). I've already modified the ,v files in a mirror hierarchy and confirmed that it avoids the infloop. If I hear no objection in the next few hours, I'll update the official ,v files on savannah. lisp/obsolete/iso-swed.el has the same problem.