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: Help me unstick my bzr, please. Date: Sat, 16 Jan 2010 11:57:03 +0200 Message-ID: <83bpgucqz4.fsf@gnu.org> References: <20100115222724.GB1931@muc.de> <87r5pqkc63.fsf@kobe.laptop> <83k4vicwws.fsf@gnu.org> <87ockuv2wj.fsf@kobe.laptop> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1263635866 3040 80.91.229.12 (16 Jan 2010 09:57:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 09:57:46 +0000 (UTC) Cc: acm@muc.de, emacs-devel@gnu.org To: Giorgos Keramidas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 16 10:57: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 1NW5PW-0005Xo-1u for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 10:57:38 +0100 Original-Received: from localhost ([127.0.0.1]:51828 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW5PX-0004Fr-1o for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 04:57:39 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NW5PP-0004Dq-6a for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:57:31 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NW5PK-00049Q-FZ for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:57:30 -0500 Original-Received: from [199.232.76.173] (port=37608 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW5PK-000492-7l for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:57:26 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:54297) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NW5PJ-0007KG-Mw for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:57:25 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0KWC00J0039NJA00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 16 Jan 2010 11:56:21 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.126.60.183]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWC00HJR3LW4E70@a-mtaout22.012.net.il>; Sat, 16 Jan 2010 11:56:21 +0200 (IST) In-reply-to: <87ockuv2wj.fsf@kobe.laptop> 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:120102 Archived-At: > From: Giorgos Keramidas > Cc: acm@muc.de, emacs-devel@gnu.org > Date: Sat, 16 Jan 2010 11:02:04 +0200 > > > Why not simply > > > > ~/emacs/emacs.bzr/quickfixes$ bzr merge --force > > To be honest, because I don't know for sure what merge --force does > under the hood. > > It sounds like it will solve the immediate problem of having a > quickfixes branch half-way through a merge, but it also seems it will > create a merge commit that includes both the pending merge changes *and* > the small fix in the same changes. Except for "bzr bisect", who else will be bothered by this?