From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: bzr handholding: restoring deleted file Date: Thu, 7 Jan 2010 16:45:57 -0800 (PST) Message-ID: <201001080045.o080jvAu008091@godzilla.ics.uci.edu> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1262911775 19236 80.91.229.12 (8 Jan 2010 00:49:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 00:49:35 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 01:49:27 2010 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 1NT32V-0004r4-QN for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 01:49:20 +0100 Original-Received: from localhost ([127.0.0.1]:52897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NT32W-0001XX-9u for ged-emacs-devel@m.gmane.org; Thu, 07 Jan 2010 19:49:20 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NT32Q-0001Wz-9v for emacs-devel@gnu.org; Thu, 07 Jan 2010 19:49:14 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NT32K-0001Vs-QY for emacs-devel@gnu.org; Thu, 07 Jan 2010 19:49:13 -0500 Original-Received: from [199.232.76.173] (port=49921 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NT32K-0001Vp-L8 for emacs-devel@gnu.org; Thu, 07 Jan 2010 19:49:08 -0500 Original-Received: from paul-mcgann-v0.ics.uci.edu ([128.195.1.147]:49259) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NT32I-00057n-HL; Thu, 07 Jan 2010 19:49:06 -0500 Original-Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by paul-mcgann-v0.ics.uci.edu (8.13.8/8.13.8) with ESMTP id o080jvbU002417 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 7 Jan 2010 16:45:57 -0800 Original-Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id o080jvAu008091; Thu, 7 Jan 2010 16:45:57 -0800 (PST) In-Reply-To: (Glenn Morris's message of "Thu, 07 Jan 2010 19:21:56 -0500") Original-Lines: 19 X-ICS-MailScanner-Information: Please send mail to helpdesk@ics.uci.edu or more information X-ICS-MailScanner-ID: o080jvbU002417 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-1.363, required 5, autolearn=disabled, ALL_TRUSTED -1.44, TW_BZ 0.08) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu 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:119635 Archived-At: Glenn Morris writes: > I made a branch with `bzr branch http://...'. > > Then I did `rm configure'. > > How do I get the damn file back again, like `cvs update' would do? > > `bzr update' chirpily says `Tree is up to date'. > `bzr pull' thinks a bit, then says `No revision to pull'. > `bzr merge' fails due to uncommitted changes. C-x v d RET it should show the file as missing. Put the cursor on it. C-x v u RET and you get it back.