From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: bzr handholding: restoring deleted file Date: Fri, 08 Jan 2010 11:24:46 +0200 Message-ID: <83iqbdaqzl.fsf@gnu.org> References: <20100108004050.GB1426@fencepost.localnet> <19270.33137.43277.502551@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1262942925 23985 80.91.229.12 (8 Jan 2010 09:28:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 09:28:45 +0000 (UTC) Cc: maarons@gnu.org, emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 10:28:38 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 1NTB8a-0002P2-CL for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 10:28:08 +0100 Original-Received: from localhost ([127.0.0.1]:53916 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTB8a-00062I-Cj for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 04:28:08 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTB8T-00061F-Cu for emacs-devel@gnu.org; Fri, 08 Jan 2010 04:28:01 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTB8O-00060t-DR for emacs-devel@gnu.org; Fri, 08 Jan 2010 04:28:00 -0500 Original-Received: from [199.232.76.173] (port=40010 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTB8O-00060q-6a for emacs-devel@gnu.org; Fri, 08 Jan 2010 04:27:56 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:64078) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTB89-0007uJ-In; Fri, 08 Jan 2010 04:27:41 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KVX00600801XL00@a-mtaout20.012.net.il>; Fri, 08 Jan 2010 11:26:46 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KVX007S08WH7F40@a-mtaout20.012.net.il>; Fri, 08 Jan 2010 11:26:42 +0200 (IST) In-reply-to: <19270.33137.43277.502551@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) 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:119661 Archived-At: > Date: Thu, 7 Jan 2010 19:50:57 -0500 > From: Glenn Morris > Cc: emacs-devel@gnu.org > > > 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. Does the following trick work? bzr revert `bzr deleted` > 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. I think bzr merge --force is what you want. It may even restore the deleted files, but I didn't try. Btw, can anyone explain what does "merge --uncommitted" do? Its description in the docs is cryptic: --uncommitted Apply uncommitted changes from a working copy, instead of branch changes. Huh?