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 21:29:13 +0200 Message-ID: <83my0o9z06.fsf@gnu.org> References: <20100108004050.GB1426@fencepost.localnet> <19270.33137.43277.502551@fencepost.gnu.org> <83iqbdaqzl.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1262979087 19510 80.91.229.12 (8 Jan 2010 19:31:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 19:31:27 +0000 (UTC) Cc: maarons@gnu.org, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 20:31:19 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 1NTKYJ-0001dh-2p for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 20:31:19 +0100 Original-Received: from localhost ([127.0.0.1]:46326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTKYJ-00064a-Fl for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 14:31:19 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTKXG-0005U9-2k for emacs-devel@gnu.org; Fri, 08 Jan 2010 14:30:14 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTKXB-0005PW-QJ for emacs-devel@gnu.org; Fri, 08 Jan 2010 14:30:13 -0500 Original-Received: from [199.232.76.173] (port=45593 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTKXB-0005PL-IC for emacs-devel@gnu.org; Fri, 08 Jan 2010 14:30:09 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:32843) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTKX8-0001gF-RK; Fri, 08 Jan 2010 14:30:07 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0KVY0090002CHS00@a-mtaout21.012.net.il>; Fri, 08 Jan 2010 21:29:04 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KVY008LM0SFIUB0@a-mtaout21.012.net.il>; Fri, 08 Jan 2010 21:29:04 +0200 (IST) In-reply-to: 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:119727 Archived-At: > From: Stefan Monnier > Cc: Glenn Morris , maarons@gnu.org, emacs-devel@gnu.org > Date: Fri, 08 Jan 2010 12:37:33 -0500 > > > 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). If it indeed does what Glenn wanted, he will have hard time staying away from it ;-)