From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: Merging Org 7.8.02 before Emacs 24.1 Date: Sat, 31 Dec 2011 12:41:25 +0100 Message-ID: <87sjk155p6.fsf@gnu.org> 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 1325331636 32503 80.91.229.12 (31 Dec 2011 11:40:36 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 31 Dec 2011 11:40:36 +0000 (UTC) Cc: Chong Yidong , "Jambunathan K." , schulte eric , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 31 12:40:30 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 1RgxIZ-0008IE-90 for ged-emacs-devel@m.gmane.org; Sat, 31 Dec 2011 12:40:27 +0100 Original-Received: from localhost ([::1]:42908 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgxIY-0007jd-BY for ged-emacs-devel@m.gmane.org; Sat, 31 Dec 2011 06:40:26 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:34918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgxIW-0007jX-9g for emacs-devel@gnu.org; Sat, 31 Dec 2011 06:40:25 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RgxIV-0008Tr-Bu for emacs-devel@gnu.org; Sat, 31 Dec 2011 06:40:24 -0500 Original-Received: from mail-ww0-f49.google.com ([74.125.82.49]:54182) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgxIS-0008TU-Me; Sat, 31 Dec 2011 06:40:20 -0500 Original-Received: by wgbdt11 with SMTP id dt11so19575418wgb.30 for ; Sat, 31 Dec 2011 03:40:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=l4G0yxPIi4lHiQ7T4JykFxWVs8GfniabNYuuy0nWm+s=; b=Oy4wmbPw25AW6srLfIsoompygZsYARf5KY8iRDDzoV/eJJIk3OaWPih24ys2b/mGR/ dw2jYSiuSgJcDom1XaSKXYzm5I98mK8utAGpsH32RqAHse4xlGst8EuY6F038LG5GxBL RY2ELe4GPq21a1ZB0SQPwq3Hr0SYHpvsnw8Yc= Original-Received: by 10.227.200.71 with SMTP id ev7mr42092198wbb.24.1325331619601; Sat, 31 Dec 2011 03:40:19 -0800 (PST) Original-Received: from myhost.localdomain (fon75-1-78-192-119-5.fbxo.proxad.net. [78.192.119.5]) by mx.google.com with ESMTPS id k5sm100113277wiz.9.2011.12.31.03.40.18 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 31 Dec 2011 03:40:18 -0800 (PST) Original-Received: by myhost.localdomain (Postfix, from userid 1000) id C9A0D13F2F; Sat, 31 Dec 2011 12:41:25 +0100 (CET) In-Reply-To: (Stefan Monnier's message of "Sat, 31 Dec 2011 05:39:47 -0500") 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 (newer, 2) X-Received-From: 74.125.82.49 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:147087 Archived-At: 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! -- Bastien