From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nick Dokos Subject: Re: Thanks for Lilypond export (and minor comments) Date: Fri, 08 Jul 2011 03:00:24 -0400 Message-ID: <17595.1310108424@alphaville.dokosmarshall.org> References: <9E8B5700-6008-4832-ACE1-BF471F129E0E@beds.ac.uk> <87sjqhdfn3.fsf@gnu.org> <874o2x1rfz.fsf@gmail.com> <87oc15nvv1.fsf@gnu.org> Reply-To: nicholas.dokos@hp.com Return-path: Received: from eggs.gnu.org ([140.186.70.92]:39065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qf53Q-0002MK-5O for emacs-orgmode@gnu.org; Fri, 08 Jul 2011 03:00:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qf53M-0004H5-Qb for emacs-orgmode@gnu.org; Fri, 08 Jul 2011 03:00:48 -0400 Received: from vms173001pub.verizon.net ([206.46.173.1]:52898) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qf53M-0004Gs-F6 for emacs-orgmode@gnu.org; Fri, 08 Jul 2011 03:00:44 -0400 Received: from alphaville.dokosmarshall.org ([unknown] [173.76.32.106]) by vms173001.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0LO000L0J64OAM60@vms173001.mailsrvcs.net> for emacs-orgmode@gnu.org; Fri, 08 Jul 2011 02:00:30 -0500 (CDT) In-reply-to: Message from Bastien of "Fri, 08 Jul 2011 08:13:06 +0200." <87oc15nvv1.fsf@gnu.org> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Bastien Cc: nicholas.dokos@hp.com, Torsten Anders , emacs-orgmode@gnu.org Bastien wrote: > > is there a process for bug-fix commits like this one which should be > > pushed through to Emacs24? I'm thinking a branch (maintenance?) to > > which this should be pushed or a special way to tag the commit? > > there is none for now -- I need to think about it. > > As I will need a few hours more to create the ChangeLog between 7.5 > and 7.6 for Emacs (yeah!), I plan to make a minor release 7.6.1 that > will be the one we'll have in Emacs. Probably tomorrow morning or > sunday morning. > > So this fix will go thru Emacs, then we can think about a better > process. Detailed suggestions from git power users welcome! > I'm not sure whether I posted this before but if you haven't seen it before, it's probably worth reading: http://nvie.com/posts/a-successful-git-branching-model/ There is a set of tools that supports this kind of workflow at https://github.com/nvie/gitflow Nick