From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: Help me unstick my bzr, please. Date: Sat, 16 Jan 2010 17:41:10 +0900 Message-ID: <87wrziqw61.fsf@uwakimon.sk.tsukuba.ac.jp> 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 1263630797 24523 80.91.229.12 (16 Jan 2010 08:33:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 08:33:17 +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 09:33:09 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 1NW45k-0006fc-Gm for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 09:33:08 +0100 Original-Received: from localhost ([127.0.0.1]:60860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW45k-0003kf-QZ for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 03:33:08 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NW45f-0003kM-6n for emacs-devel@gnu.org; Sat, 16 Jan 2010 03:33:03 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NW45Z-0003k7-BM for emacs-devel@gnu.org; Sat, 16 Jan 2010 03:33:01 -0500 Original-Received: from [199.232.76.173] (port=48655 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW45Z-0003k4-7i for emacs-devel@gnu.org; Sat, 16 Jan 2010 03:32:57 -0500 Original-Received: from mtps01.sk.tsukuba.ac.jp ([130.158.97.223]:57981) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NW45X-00041F-4K; Sat, 16 Jan 2010 03:32:55 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mtps01.sk.tsukuba.ac.jp (Postfix) with ESMTP id CCF5A1537B5; Sat, 16 Jan 2010 17:32:53 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 2AE721A2A92; Sat, 16 Jan 2010 17:41:11 +0900 (JST) In-Reply-To: <83k4vicwws.fsf@gnu.org> X-Mailer: VM 8.0.12-devo-585 under 21.5 (beta29) "garbanzo" a03421eb562b XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:120095 Archived-At: Eli Zaretskii writes: > Why not simply > > ~/emacs/emacs.bzr/quickfixes$ bzr merge --force Because Alan's commit will be a merge commit, not a regular commit. This probably won't confuse most humans, who will be looking at Alan's commit message, not at the parentage of the commit, but it might cause issues with DAG tracing tools like bisect. It will also very likely cause Alan's commit to appear to be the mainline, and all of the commits he has merged to be a feature branch, in the logs and GUI DAG viewers. This would be disconcerting to experienced bzr users.