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: bidi branch Date: Fri, 12 Mar 2010 10:46:04 +0200 Message-ID: <83hbom0vxv.fsf@gnu.org> References: <87zl2g24xy.fsf@stupidchicken.com> <83d3zc2iqr.fsf@gnu.org> <87eijsoz6u.fsf@lola.goethe.zz> <833a073kss.fsf@gnu.org> <83wrxj1o92.fsf@gnu.org> <83vdd220yk.fsf@gnu.org> <83r5nq1vox.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1268383869 23955 80.91.229.12 (12 Mar 2010 08:51:09 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 12 Mar 2010 08:51:09 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 12 09:51:05 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.69) (envelope-from ) id 1Nq0a0-0001QM-Ro for ged-emacs-devel@m.gmane.org; Fri, 12 Mar 2010 09:50:49 +0100 Original-Received: from localhost ([127.0.0.1]:42110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nq0Zz-00067A-35 for ged-emacs-devel@m.gmane.org; Fri, 12 Mar 2010 03:50:47 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nq0VP-00052D-QI for emacs-devel@gnu.org; Fri, 12 Mar 2010 03:46:04 -0500 Original-Received: from [140.186.70.92] (port=36956 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nq0VN-00051T-Ix for emacs-devel@gnu.org; Fri, 12 Mar 2010 03:46:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nq0VM-0007Tg-Dg for emacs-devel@gnu.org; Fri, 12 Mar 2010 03:46:01 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:62325) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nq0VM-0007TT-79 for emacs-devel@gnu.org; Fri, 12 Mar 2010 03:46:00 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0KZ500L00UYUJQ00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Fri, 12 Mar 2010 10:45:59 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.70.214.230]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KZ500K7DV0LGJ30@a-mtaout21.012.net.il>; Fri, 12 Mar 2010 10:45:58 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.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:121854 Archived-At: > From: Stefan Monnier > Cc: emacs-devel@gnu.org > Date: Thu, 11 Mar 2010 17:45:57 -0500 > > >> > (Not that you should expect the merge today or tomorrow, even if > >> > everybody agrees.) > >> Right, so unless this is expected to be "real soon now", you might want > >> to publish your branch in `emacs-bidi'. > > Is that even possible? `emacs-bidi' was branched from pre-22.1 Emacs, > > while my development branch was branched from Emacs 23.1. Wouldn't > > merging them create some very messy history DAG? > > No need to merge them. You can just "bzr push --overwrite .../emacs-bidi". I prefer to merge with the trunk, unless you object. Since the bidi code is not run unless the user turns on a variable, I don't see any reasons for a separate branch. A separate branch complicates logistics (for me, at least) and increases chances of a mistaken commit. It also exposes the modified code to fewer users. As for reasons for not merging VSN, they will delay a separate branch as well, since they are unrelated to the stability of the code.