From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Dzhus Newsgroups: gmane.emacs.devel Subject: Re: New sync'd branch Date: Mon, 24 Aug 2009 23:24:33 +0400 Message-ID: <878wh9qaku.fsf@sphinx.net.ru> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1251142226 10150 80.91.229.12 (24 Aug 2009 19:30:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 24 Aug 2009 19:30:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 24 21:30:19 2009 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 1MffF8-0004UN-N9 for ged-emacs-devel@m.gmane.org; Mon, 24 Aug 2009 21:30:15 +0200 Original-Received: from localhost ([127.0.0.1]:45143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MffF8-0000of-1K for ged-emacs-devel@m.gmane.org; Mon, 24 Aug 2009 15:30:14 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MffF1-0000mh-QW for emacs-devel@gnu.org; Mon, 24 Aug 2009 15:30:07 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MffEt-0000fs-1T for emacs-devel@gnu.org; Mon, 24 Aug 2009 15:30:03 -0400 Original-Received: from [199.232.76.173] (port=51322 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MffEs-0000fg-Jq for emacs-devel@gnu.org; Mon, 24 Aug 2009 15:29:58 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:55133) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MffEr-0002Es-Th for emacs-devel@gnu.org; Mon, 24 Aug 2009 15:29:58 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1MffEq-0004ML-Bs for emacs-devel@gnu.org; Mon, 24 Aug 2009 21:29:56 +0200 Original-Received: from 95-24-95-208.broadband.corbina.ru ([95.24.95.208]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 24 Aug 2009 21:29:56 +0200 Original-Received: from dima by 95-24-95-208.broadband.corbina.ru with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 24 Aug 2009 21:29:56 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 19 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 95-24-95-208.broadband.corbina.ru User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) Cancel-Lock: sha1:O2jp1M5pNq7nWN/jwOcqkc5+eeA= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:114562 Archived-At: Stefan Monnier wrote: > - People installing changes need to carefully choose whether to install > it on the 23 branch (from where it will be sync'd to the "24 branch" > aka "trunk"), or on the trunk. Basically, the most important aspect > is that any bugfix which makes sense on the 23 branch need to be > installed on the 23 branch rather than on the trunk. I don't know how things are set up, so what I don't understand is whether the «new trunk» will be a complete superset of «23 branch»? If some fix should go both to «pretty stable» and «unstable» branches, what shall I do? Commit them separately? Maybe it's not a big problem really given that probably not so many changes need to be in 23 branch instead of just trunk, but it's unclear to me how the branches are synced. -- Happy Hacking. http://sphinx.net.ru む