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: Help me unstick my bzr, please. Date: Sat, 16 Jan 2010 14:36:06 -0500 Message-ID: References: <20100115222724.GB1931@muc.de> <87r5pqkc63.fsf@kobe.laptop> <83k4vicwws.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 1263670589 3489 80.91.229.12 (16 Jan 2010 19:36:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 19:36:29 +0000 (UTC) Cc: Giorgos Keramidas , acm@muc.de, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 16 20:36:21 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 1NWERX-0002Lo-H5 for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 20:36:19 +0100 Original-Received: from localhost ([127.0.0.1]:48057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWERY-0003UY-B0 for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 14:36:20 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NWERR-0003TJ-H4 for emacs-devel@gnu.org; Sat, 16 Jan 2010 14:36:13 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NWERN-0003Qu-4O for emacs-devel@gnu.org; Sat, 16 Jan 2010 14:36:13 -0500 Original-Received: from [199.232.76.173] (port=45620 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWERM-0003Qq-TX for emacs-devel@gnu.org; Sat, 16 Jan 2010 14:36:08 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:37773 helo=ironport2-out.pppoe.ca) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NWERL-0003Zj-Jn; Sat, 16 Jan 2010 14:36:07 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AsQEAGekUUvO+LMp/2dsb2JhbACBRNVchDIEij8 X-IronPort-AV: E=Sophos;i="4.49,287,1262581200"; d="scan'208";a="53897727" Original-Received: from 206-248-179-41.dsl.teksavvy.com (HELO pastel.home) ([206.248.179.41]) by ironport2-out.pppoe.ca with ESMTP; 16 Jan 2010 14:36:06 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id AF91E806E; Sat, 16 Jan 2010 14:36:06 -0500 (EST) In-Reply-To: <83k4vicwws.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 16 Jan 2010 09:48:51 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:120117 Archived-At: >> 6. Commit them with "bzr commit". > Why not simply > $ bzr merge --force Other than the issues already mentioned, there's also the fact that Bazaar developpers discourage its use and are not very interested in making it work right. So, among other things, this will tend to remerge things that were already merged and then create spurious conflicts. It may get confused in other ways as well, I just know that the few times I tried to use it, I quickly got sufficiently annoyed that I consider it basically unusable. Stefan