From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eric Schulte Newsgroups: gmane.emacs.devel Subject: Re: Merging Org 7.8.02 before Emacs 24.1 Date: Sat, 31 Dec 2011 10:17:05 -0700 Message-ID: <87r4zk8xv2.fsf@gmx.com> References: <877h1ncs1u.fsf@altern.org> <87ipl3g4jr.fsf@gnu.org> <87vcp3hfuh.fsf@gnu.org> <87boqshtul.fsf@gnu.org> <877h1df8ny.fsf@altern.org> <87sjk155p6.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1325351860 17513 80.91.229.12 (31 Dec 2011 17:17:40 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 31 Dec 2011 17:17:40 +0000 (UTC) Cc: Chong Yidong , emacs-devel@gnu.org, Stefan Monnier , schulte eric , "Jambunathan K." To: Bastien Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 31 18:17:32 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 1Rh2Yl-0001Za-Sw for ged-emacs-devel@m.gmane.org; Sat, 31 Dec 2011 18:17:32 +0100 Original-Received: from localhost ([::1]:60942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rh2Yl-0007WZ-22 for ged-emacs-devel@m.gmane.org; Sat, 31 Dec 2011 12:17:31 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:36396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rh2Yi-0007WU-QV for emacs-devel@gnu.org; Sat, 31 Dec 2011 12:17:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rh2Yf-0000uj-IZ for emacs-devel@gnu.org; Sat, 31 Dec 2011 12:17:28 -0500 Original-Received: from mailout-us.gmx.com ([74.208.5.67]:56523 helo=mailout-us.mail.com) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1Rh2Yf-0000uX-C2 for emacs-devel@gnu.org; Sat, 31 Dec 2011 12:17:25 -0500 Original-Received: (qmail invoked by alias); 31 Dec 2011 17:17:23 -0000 Original-Received: from c-174-56-1-147.hsd1.nm.comcast.net (EHLO bagel) [174.56.1.147] by mail.gmx.com (mp-us007) with SMTP; 31 Dec 2011 12:17:23 -0500 X-Authenticated: #67821228 X-Provags-ID: V01U2FsdGVkX1/BkdFFHq7BfdBL6aTaDbbCg2rBfdc1cZI5ByfDRz de2VdcMOCe++UU In-Reply-To: <87sjk155p6.fsf@gnu.org> (Bastien's message of "Sat, 31 Dec 2011 12:41:25 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.208.5.67 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:147100 Archived-At: Bastien writes: > Stefan Monnier writes: > >> I'd suggest you setup a regular "merge from Emacs trunk". So your >> "maint" branch can simply be the Emacs trunk. > > Not sure I can parse this correctly. > > Your suggestion is to create a branch on org-mode.git that contains > the latest org* files from the Emacs trunk? Then to patch the Emacs > trunk with patches that go into that branch? > > Thanks for further explanations! I believe the suggestion is to increase the frequency of merges with the Emacs trunk s.t. every Org-mode major release is also a merge with the Emacs trunk. Then we have no need for a release-specific maintenance branch *and* a branch tracking the Emacs trunk as they will be one in the same. I do think that (after the feature freeze) a tighter coupling between the Org-mode and Emacs development repositories with more frequent and less dramatic merges would be a good thing. Although I don't know how much manual work is required to accomplish each merge. -- Eric Schulte http://cs.unm.edu/~eschulte/