From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Giorgos Keramidas Newsgroups: gmane.emacs.devel Subject: Re: Help me unstick my bzr, please. Date: Sat, 16 Jan 2010 12:04:37 +0200 Message-ID: <878wbyv00a.fsf@kobe.laptop> References: <20100115222724.GB1931@muc.de> <87r5pqkc63.fsf@kobe.laptop> <83k4vicwws.fsf@gnu.org> <87ockuv2wj.fsf@kobe.laptop> <83bpgucqz4.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 1263636303 4231 80.91.229.12 (16 Jan 2010 10:05:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 10:05:03 +0000 (UTC) Cc: 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 11:04:55 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 1NW5WZ-0007nB-FW for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 11:04:55 +0100 Original-Received: from localhost ([127.0.0.1]:33666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW5WZ-0008D4-W8 for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 05:04:56 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NW5WR-0008BO-JM for emacs-devel@gnu.org; Sat, 16 Jan 2010 05:04:47 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NW5WO-000880-4A for emacs-devel@gnu.org; Sat, 16 Jan 2010 05:04:47 -0500 Original-Received: from [199.232.76.173] (port=49271 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW5WN-00087g-KJ for emacs-devel@gnu.org; Sat, 16 Jan 2010 05:04:43 -0500 Original-Received: from poseidon.ceid.upatras.gr ([150.140.141.169]:54190) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NW5WK-0001QW-II; Sat, 16 Jan 2010 05:04:40 -0500 Original-Received: from mail.ceid.upatras.gr (unknown [10.1.0.143]) by poseidon.ceid.upatras.gr (Postfix) with ESMTP id A084DEB47E4; Sat, 16 Jan 2010 12:04:39 +0200 (EET) Original-Received: from localhost (europa.ceid.upatras.gr [127.0.0.1]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 91120160F6B; Sat, 16 Jan 2010 12:04:39 +0200 (EET) X-Virus-Scanned: amavisd-new at ceid.upatras.gr Original-Received: from mail.ceid.upatras.gr ([127.0.0.1]) by localhost (europa.ceid.upatras.gr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jbn8ZM9Q1rcS; Sat, 16 Jan 2010 12:04:39 +0200 (EET) Original-Received: from kobe.laptop (ppp-94-64-252-169.home.otenet.gr [94.64.252.169]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 4F254160F68; Sat, 16 Jan 2010 12:04:39 +0200 (EET) Original-Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.3/8.14.3) with ESMTP id o0GA4cCu063748 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 16 Jan 2010 12:04:38 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Original-Received: (from keramida@localhost) by kobe.laptop (8.14.3/8.14.3/Submit) id o0GA4bkB063745; Sat, 16 Jan 2010 12:04:37 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) In-Reply-To: <83bpgucqz4.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 16 Jan 2010 11:57:03 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (berkeley-unix) 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:120105 Archived-At: On Sat, 16 Jan 2010 11:57:03 +0200, Eli Zaretskii wrote: >> 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? It's conceivable that nobody will notice. Committing a merge that joins two history 'heads' in the DAG separately and then a small diff on top of that serves mostly as a very easy way to keep the diff of the quick fix really-really small. This is a useful property, but it's not like the world will end if we don't do it.