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 10:59:17 +0200 Message-ID: <83eilqctne.fsf@gnu.org> References: <20100115222724.GB1931@muc.de> <87r5pqkc63.fsf@kobe.laptop> <83k4vicwws.fsf@gnu.org> <87wrziqw61.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1263632339 27453 80.91.229.12 (16 Jan 2010 08:58:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 08:58:59 +0000 (UTC) Cc: keramida@ceid.upatras.gr, acm@muc.de, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 16 09:58:51 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 1NW4Uc-00064y-Tg for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 09:58:51 +0100 Original-Received: from localhost ([127.0.0.1]:39657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW4Ud-0001IJ-Nm for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 03:58:51 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NW4UZ-0001Hm-77 for emacs-devel@gnu.org; Sat, 16 Jan 2010 03:58:47 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NW4UU-0001Dv-O7 for emacs-devel@gnu.org; Sat, 16 Jan 2010 03:58:46 -0500 Original-Received: from [199.232.76.173] (port=34433 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW4UU-0001Di-Gd for emacs-devel@gnu.org; Sat, 16 Jan 2010 03:58:42 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:45935) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NW4UT-0003TO-7n for emacs-devel@gnu.org; Sat, 16 Jan 2010 03:58:42 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0KWC00H000QGDR00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 16 Jan 2010 10:58:39 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.126.60.183]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWC00HZE0XM4E10@a-mtaout22.012.net.il>; Sat, 16 Jan 2010 10:58:35 +0200 (IST) In-reply-to: <87wrziqw61.fsf@uwakimon.sk.tsukuba.ac.jp> 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:120096 Archived-At: > From: "Stephen J. Turnbull" > Cc: Giorgos Keramidas , > acm@muc.de, > emacs-devel@gnu.org > Date: Sat, 16 Jan 2010 17:41:10 +0900 > > 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. For such a small change, I doubt if this is significant. > 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. Sorry, I don't understand what you mean by ``appear to be mainline'' and by ``commits [...] to be a feature branch''. Can you elaborate?