From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: bzr handholding: restoring deleted file Date: Thu, 7 Jan 2010 19:50:57 -0500 Message-ID: <19270.33137.43277.502551@fencepost.gnu.org> References: <20100108004050.GB1426@fencepost.localnet> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1262912564 21227 80.91.229.12 (8 Jan 2010 01:02:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 01:02:44 +0000 (UTC) Cc: emacs-devel@gnu.org To: Marek Aaron Sapota Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 02:02:37 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 1NT3FM-0000on-8p for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 02:02:36 +0100 Original-Received: from localhost ([127.0.0.1]:55059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NT3FN-0007kF-0r for ged-emacs-devel@m.gmane.org; Thu, 07 Jan 2010 20:02:37 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NT3EP-0006kK-1N for emacs-devel@gnu.org; Thu, 07 Jan 2010 20:01:37 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NT3EJ-0006cC-1H for emacs-devel@gnu.org; Thu, 07 Jan 2010 20:01:36 -0500 Original-Received: from [199.232.76.173] (port=35425 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NT3EI-0006bn-FK for emacs-devel@gnu.org; Thu, 07 Jan 2010 20:01:30 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:50815) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NT3EI-00010g-2S for emacs-devel@gnu.org; Thu, 07 Jan 2010 20:01:30 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1NT345-00058w-6N; Thu, 07 Jan 2010 19:50:57 -0500 In-Reply-To: <20100108004050.GB1426@fencepost.localnet> X-Attribution: GM X-Mailer: VM (www.wonderworks.com/vm), GNU Emacs (www.gnu.org/software/emacs) X-Hue: red X-Ran: }3fZw1z[)'Q"o+3s,H:[OF5@a|v.A/Xc+W/U~)|RorOO:C`W30C~aWP?Z(3y5?Da(wWl~w 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:119638 Archived-At: Marek Aaron Sapota wrote (on Thu, 7 Jan 2010 at 19:40 -0500): > Use bzr revert configure. What command can I type to get the equivalent functionality of `cvs update'? In other words, I want to: restore any and all deleted files, without me having to list the individual file names. merge in any changes from the Emacs repository. If I have any local uncommitted changes (there will be no local commits in this case) in the relevant files, I want automatic merging, with conflict markers and a warning where necessary.