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: Sun, 17 Jan 2010 15:04:32 +0900 Message-ID: <878wbxtggf.fsf@uwakimon.sk.tsukuba.ac.jp> References: <20100115222724.GB1931@muc.de> <87r5pqkc63.fsf@kobe.laptop> <83k4vicwws.fsf@gnu.org> <87wrziqw61.fsf@uwakimon.sk.tsukuba.ac.jp> <83eilqctne.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 1263707804 21102 80.91.229.12 (17 Jan 2010 05:56:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 17 Jan 2010 05:56:44 +0000 (UTC) Cc: keramida@ceid.upatras.gr, acm@muc.de, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 17 06:56:36 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 1NWO7n-00088n-Nc for ged-emacs-devel@m.gmane.org; Sun, 17 Jan 2010 06:56:36 +0100 Original-Received: from localhost ([127.0.0.1]:39887 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWO7o-0000aM-Nh for ged-emacs-devel@m.gmane.org; Sun, 17 Jan 2010 00:56:36 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NWO7i-0000YQ-HQ for emacs-devel@gnu.org; Sun, 17 Jan 2010 00:56:30 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NWO7d-0000YC-2F for emacs-devel@gnu.org; Sun, 17 Jan 2010 00:56:29 -0500 Original-Received: from [199.232.76.173] (port=51573 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWO7c-0000Y9-Sc for emacs-devel@gnu.org; Sun, 17 Jan 2010 00:56:24 -0500 Original-Received: from mtps01.sk.tsukuba.ac.jp ([130.158.97.223]:60186) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NWO7a-0005rd-Vk; Sun, 17 Jan 2010 00:56:23 -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 A0F441537B3; Sun, 17 Jan 2010 14:56:21 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 399EE1A35F6; Sun, 17 Jan 2010 15:04:32 +0900 (JST) In-Reply-To: <83eilqctne.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:120135 Archived-At: Eli Zaretskii writes: > Sorry, I don't understand what you mean by ``appear to be mainline'' > and by ``commits [...] to be a feature branch''. Can you elaborate? I suspect the approach you propose will have the following appearance in bzr log: $ bzr log 2 acm made a small change to CC mode 1 rms made a small change to RMail $ bzr log -n0 2 acm made a small change to CC mode 1.3 eli made a small change to the MSDOS Makefile.in 1.2 cyd released Emacs 23.2 1.1 dak added a node to Info 1 rms made a small change to RMail $ Very likely to happen in acm's mirror branch, and I believe that this would propagate to the main repository when he pushes. It is *definitely possible* for this to happen. Whether or not it *will* happen depends on exactly what the state of acm's branch is and how he goes about fixing it up, merging to trunk, and pushing to Savannah. If it happens and gets pushed, it is repairable, of course, but only at the cost of rebasing a published branch.