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: Confusing "bzr log" as result of merges Date: Sat, 21 May 2011 19:48:47 +0300 Message-ID: <83tycodmog.fsf@gnu.org> References: <83ipt4fqyy.fsf@gnu.org> <87ei3s2fdm.fsf@wanadoo.es> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: dough.gmane.org 1305996543 5376 80.91.229.12 (21 May 2011 16:49:03 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 16:49:03 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 18:48:52 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QNpMC-0003ED-1f for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 18:48:52 +0200 Original-Received: from localhost ([::1]:34334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpMB-0004FF-89 for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 12:48:51 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:46992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpM8-0004F9-BK for emacs-devel@gnu.org; Sat, 21 May 2011 12:48:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNpM7-0000xZ-8W for emacs-devel@gnu.org; Sat, 21 May 2011 12:48:48 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:47623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpM7-0000xS-0k for emacs-devel@gnu.org; Sat, 21 May 2011 12:48:47 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0LLK00J0019D4T00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Sat, 21 May 2011 19:48:44 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.124.254.13]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LLK00I7B1D6WS60@a-mtaout21.012.net.il>; Sat, 21 May 2011 19:48:44 +0300 (IDT) In-reply-to: <87ei3s2fdm.fsf@wanadoo.es> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.169 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:139600 Archived-At: > From: =D3scar Fuentes > Date: Sat, 21 May 2011 18:21:57 +0200 >=20 > Create a branch emacs-common and commit there all the changes inten= ded > for emacs-23 and trunk. Given that the trunk and the branch diverge quite quickly, I don't think what you suggest is practical. The divergence is in the basic infrastructure, such as access to global variables and members of buffer and keyboard objects. That makes such a common branch problematic, as it is not clear which one of the diverging branches i= t should follow, and how to be sure that all 3 branches "work". > From time to time *merge* (not cherry-pick!) emacs-common into > emacs-23 and trunk. We merge already, but then reverse cherry-pick those revisions that are not intended for the trunk, before committing. At least this is my understanding of how merges from the branch work. > Long time ago I advised against mixing cherry-picks and merges and > suggested this strategy, but was discarded because it is too > complex. I'm sure that as time passes and you get bitten again and = again > by the current practice it will finally look extremely simple. Since no one is even bothered by these issues, I very much doubt that anything will be done any time soon.