From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tom Tromey Newsgroups: gmane.emacs.devel Subject: Re: Off topic: help with CVS, please! Date: Sun, 22 Feb 2009 14:02:51 -0700 Message-ID: References: <20090222205527.GA8368@muc.de> Reply-To: Tom Tromey NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1235336592 23952 80.91.229.12 (22 Feb 2009 21:03:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 22 Feb 2009 21:03:12 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 22 22:04:28 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 1LbLUw-00066l-73 for ged-emacs-devel@m.gmane.org; Sun, 22 Feb 2009 22:04:26 +0100 Original-Received: from localhost ([127.0.0.1]:34824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LbLTb-0002if-SI for ged-emacs-devel@m.gmane.org; Sun, 22 Feb 2009 16:03:03 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LbLTY-0002iW-1P for emacs-devel@gnu.org; Sun, 22 Feb 2009 16:03:00 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LbLTW-0002iJ-Ih for emacs-devel@gnu.org; Sun, 22 Feb 2009 16:02:59 -0500 Original-Received: from [199.232.76.173] (port=45820 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LbLTW-0002iG-Fi for emacs-devel@gnu.org; Sun, 22 Feb 2009 16:02:58 -0500 Original-Received: from mx2.redhat.com ([66.187.237.31]:53922) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LbLTV-0006WM-Su for emacs-devel@gnu.org; Sun, 22 Feb 2009 16:02:58 -0500 Original-Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n1ML2uRG007145; Sun, 22 Feb 2009 16:02:56 -0500 Original-Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n1ML2sYJ009285; Sun, 22 Feb 2009 16:02:54 -0500 Original-Received: from opsy.redhat.com (vpn-12-137.rdu.redhat.com [10.11.12.137]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n1ML2qQq004743; Sun, 22 Feb 2009 16:02:53 -0500 Original-Received: by opsy.redhat.com (Postfix, from userid 500) id 1ACA13784B7; Sun, 22 Feb 2009 14:02:52 -0700 (MST) X-Attribution: Tom In-Reply-To: <20090222205527.GA8368@muc.de> (Alan Mackenzie's message of "Sun\, 22 Feb 2009 20\:55\:27 +0000") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:109290 Archived-At: >>>>> "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. 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. You can also do a reverse merge on a pristine tree: cvs update -j5.288 -j5.286 cc-langs.el ... or make a reverse patch that way and apply it. Tom