From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Merging Org 7.8.02 before Emacs 24.1 Date: Sat, 31 Dec 2011 05:39:47 -0500 Message-ID: References: <877h1ncs1u.fsf@altern.org> <87ipl3g4jr.fsf@gnu.org> <87vcp3hfuh.fsf@gnu.org> <87boqshtul.fsf@gnu.org> <877h1df8ny.fsf@altern.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1325328002 13113 80.91.229.12 (31 Dec 2011 10:40:02 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 31 Dec 2011 10:40:02 +0000 (UTC) Cc: Chong Yidong , "Jambunathan K." , schulte eric , emacs-devel@gnu.org To: Bastien Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 31 11:39:57 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 1RgwLz-0001M8-RJ for ged-emacs-devel@m.gmane.org; Sat, 31 Dec 2011 11:39:55 +0100 Original-Received: from localhost ([::1]:43327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgwLz-00077C-9N for ged-emacs-devel@m.gmane.org; Sat, 31 Dec 2011 05:39:55 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:58466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgwLv-000770-IL for emacs-devel@gnu.org; Sat, 31 Dec 2011 05:39:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RgwLu-0000Fx-LP for emacs-devel@gnu.org; Sat, 31 Dec 2011 05:39:51 -0500 Original-Received: from smtp-02.vtx.ch ([194.38.175.91]:53912) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgwLt-0000Fc-Cr; Sat, 31 Dec 2011 05:39:49 -0500 Original-Received: from ceviche.home (dyn.83-228-174-200.dsl.vtx.ch [83.228.174.200]) by smtp-02.vtx.ch (VTX Services SA) with ESMTP id 794F060109; Sat, 31 Dec 2011 11:39:48 +0100 (CET) Original-Received: by ceviche.home (Postfix, from userid 20848) id 8FEB266162; Sat, 31 Dec 2011 05:39:47 -0500 (EST) In-Reply-To: <877h1df8ny.fsf@altern.org> (Bastien's message of "Sat, 31 Dec 2011 09:27:13 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.38.175.91 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:147083 Archived-At: > This is what I will try to do from now on: the Org master branch is for > development and the maint branch is for bug fixes. I'd suggest you setup a regular "merge from Emacs trunk". So your "maint" branch can simply be the Emacs trunk. Stefan