From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: Off topic: help with CVS, please! Date: Mon, 23 Feb 2009 18:09:11 +0000 Message-ID: <20090223180911.GA8240@muc.de> References: <20090222205527.GA8368@muc.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1235411259 13693 80.91.229.12 (23 Feb 2009 17:47:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Feb 2009 17:47:39 +0000 (UTC) Cc: emacs-devel@gnu.org To: Tom Tromey Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 23 18:48:54 2009 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 1LbevF-00008P-AL for ged-emacs-devel@m.gmane.org; Mon, 23 Feb 2009 18:48:53 +0100 Original-Received: from localhost ([127.0.0.1]:46250 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lbetu-0004x8-Nk for ged-emacs-devel@m.gmane.org; Mon, 23 Feb 2009 12:47:30 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lbeto-0004wX-RY for emacs-devel@gnu.org; Mon, 23 Feb 2009 12:47:24 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lbetn-0004vV-Dq for emacs-devel@gnu.org; Mon, 23 Feb 2009 12:47:24 -0500 Original-Received: from [199.232.76.173] (port=36795 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lbetn-0004vS-9E for emacs-devel@gnu.org; Mon, 23 Feb 2009 12:47:23 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:2876 helo=mail.muc.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lbetm-00064q-6J for emacs-devel@gnu.org; Mon, 23 Feb 2009 12:47:22 -0500 Original-Received: (qmail 51766 invoked by uid 3782); 23 Feb 2009 17:47:19 -0000 Original-Received: from acm.muc.de (pD9E233CB.dip.t-dialin.net [217.226.51.203]) by colin2.muc.de (tmda-ofmipd) with ESMTP; Mon, 23 Feb 2009 18:47:17 +0100 Original-Received: (qmail 8735 invoked by uid 1000); 23 Feb 2009 18:09:11 -0000 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.9i X-Delivery-Agent: TMDA/1.1.5 (Fettercairn) X-Primary-Address: acm@muc.de X-detected-operating-system: by monty-python.gnu.org: FreeBSD 4.6-4.9 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:109300 Archived-At: Hi, Tom! On Sun, Feb 22, 2009 at 02:02:51PM -0700, Tom Tromey wrote: > >>>>> "Alan" == Alan Mackenzie writes: > Alan> I tried deleting cc-langs.el and > Alan> # cvs update -r5.286 cc-langs.el > This will check out the revision but also make a sticky tag. > Copy cc-langs.el somewhere safe, then "cvs update -A". > Then copy it back. Done that. It worked! > Alan> There doesn't seem to be a nice > Alan> simple command like > Alan> # cvs get -r5.286 cc-langs.el > /path/to/temp_file.el > You can use "cvs co -p" for this. Does cvs checkout work on a single file? > You can also do a reverse merge on a pristine tree: > cvs update -j5.288 -j5.286 cc-langs.el Did that. It worked, too! > ... or make a reverse patch that way and apply it. Many thanks! I've now got things consistent again. > Tom -- Alan Mackenzie (Nuremberg, Germany).