From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: bzr handholding: restoring deleted file Date: Fri, 08 Jan 2010 12:37:33 -0500 Message-ID: References: <20100108004050.GB1426@fencepost.localnet> <19270.33137.43277.502551@fencepost.gnu.org> <83iqbdaqzl.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1262972365 28034 80.91.229.12 (8 Jan 2010 17:39:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 17:39:25 +0000 (UTC) Cc: maarons@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 18:39:18 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 1NTIns-0004JT-UB for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 18:39:17 +0100 Original-Received: from localhost ([127.0.0.1]:57177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTInt-0006A1-AL for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 12:39:17 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTImR-0004lA-9y for emacs-devel@gnu.org; Fri, 08 Jan 2010 12:37:47 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTImL-0004hI-6h for emacs-devel@gnu.org; Fri, 08 Jan 2010 12:37:46 -0500 Original-Received: from [199.232.76.173] (port=51203 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTImK-0004h7-SD for emacs-devel@gnu.org; Fri, 08 Jan 2010 12:37:41 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:46911) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTImG-0005b1-FP; Fri, 08 Jan 2010 12:37:36 -0500 Original-Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id o08HbXd7022343; Fri, 8 Jan 2010 12:37:33 -0500 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id A7DE990018; Fri, 8 Jan 2010 12:37:33 -0500 (EST) In-Reply-To: <83iqbdaqzl.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 08 Jan 2010 11:24:46 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3443=0 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:119713 Archived-At: > I think > bzr merge --force > is what you want. BTW, I recommend people stay away from it, not because it's inherently nasty, but because it's poorly supported (because Bzr developpers don't consider it an important case to handle well). Stefan