From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: [DIFFS] Re: Connection to emacs CVS broken ? Date: Fri, 16 Mar 2007 10:14:36 +0900 Organization: NEC Electronics Message-ID: References: <86wt1kw5rp.fsf@lola.quinscape.zz> <4k8xdziuwz.fsf@fencepost.gnu.org> <87k5xi45h5.fsf@stupidchicken.com> <17913.45372.941749.353301@kahikatea.snap.net.nz> <45F9C5E8.1010700@gnu.org> <87ps7am73r.fsf@catnip.gol.com> <17913.59348.720489.675967@kahikatea.snap.net.nz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1174007708 18856 80.91.229.12 (16 Mar 2007 01:15:08 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 16 Mar 2007 01:15:08 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 16 02:15:01 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 1HS125-0005fX-8O for ged-emacs-devel@m.gmane.org; Fri, 16 Mar 2007 02:15:01 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HS138-0008VX-EU for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2007 20:16:06 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HS134-0008V1-Hv for emacs-devel@gnu.org; Thu, 15 Mar 2007 21:16:02 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HS133-0008UA-QT for emacs-devel@gnu.org; Thu, 15 Mar 2007 21:16:02 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HS133-0008U7-KT for emacs-devel@gnu.org; Thu, 15 Mar 2007 20:16:01 -0500 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1HS11z-0007VZ-Hj for emacs-devel@gnu.org; Thu, 15 Mar 2007 21:14:55 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1HS11r-00056O-3Y for emacs-devel@gnu.org; Fri, 16 Mar 2007 02:14:47 +0100 Original-Received: from fencepost.gnu.org ([199.232.76.164]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 16 Mar 2007 02:14:47 +0100 Original-Received: from miles.bader by fencepost.gnu.org with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 16 Mar 2007 02:14:47 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 35 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: fencepost.gnu.org System-Type: i686-pc-linux-gnu Blat: Foop Cancel-Lock: sha1:vwNpe6D0HNdlyNnUy+ExQjDYv84= X-detected-kernel: Linux 2.6, seldom 2.4 (older, 4) 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:67979 Archived-At: Nick Roberts writes: > > > Maybe the best thing is to restore from NIIMI Satoshi's rsync of the > > > repository? [He said it's from 2007-03-13 02:48 GMT] > > > > Indeed! This would restore the CVS files, not just the changes. > > I don't know NIIMI Satoshi, but I'm sure he's a fine fellow. However, it's one > thing to rely on an outside source for the last few changes, and another to > rely on such a source for the *entire* revision history of Emacs. > > If we do follow this route then I would urge caution and suggest that someone, > perhaps from Savannah, check that the only differences are, indeed, only in the > last few changes. Right. That's why I said: "I think the changes from the restored repository to the rsync would be small enough that they could probably be verified by eye." What I had in mind was simply doing a diff of the raw restored repository tree to the rsync repository tree. CVS files are fairly understandable text format, and the number of changes on the trunk is small enough that I think simply looking at that diff should be good enough for a small number of trunk changes. Unfortunately, now that I've thought about it more, a potential problem comes to mind: I think my last trunk->unicode sync is missing from the restored repository, and is probably in the rsync'd repository, and _those_ changes are not small. Since CVS mixes all branches in a single CVS file, interpreting those parts of the diff might not be so nice (and it affects a lot of files)... -Miles -- Yo mama's so fat when she gets on an elevator it HAS to go down.