From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: Thanks for Lilypond export (and minor comments) Date: Fri, 08 Jul 2011 23:00:18 +0200 Message-ID: <87oc14fpy5.fsf@Rainer.invalid> References: <9E8B5700-6008-4832-ACE1-BF471F129E0E@beds.ac.uk> <87sjqhdfn3.fsf@gnu.org> <874o2x1rfz.fsf@gmail.com> <87oc15nvv1.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([140.186.70.92]:50754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfIAC-0003XZ-FD for emacs-orgmode@gnu.org; Fri, 08 Jul 2011 17:00:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QfIA7-0004YZ-J8 for emacs-orgmode@gnu.org; Fri, 08 Jul 2011 17:00:40 -0400 Received: from lo.gmane.org ([80.91.229.12]:57154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfIA7-0004YS-9U for emacs-orgmode@gnu.org; Fri, 08 Jul 2011 17:00:35 -0400 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1QfIA4-00072R-Hu for emacs-orgmode@gnu.org; Fri, 08 Jul 2011 23:00:32 +0200 Received: from p57aac1d2.dip.t-dialin.net ([87.170.193.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 08 Jul 2011 23:00:32 +0200 Received: from Stromeko by p57aac1d2.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 08 Jul 2011 23:00:32 +0200 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: emacs-orgmode@gnu.org Bastien writes: >> 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. Pure fixes should probably be applied on top of maint and then merged into master (not cherry-picked from master to maint, this would create duplicate history). On occasion this might produce a merge conflict, but these instances should be rare. That way maint would be a stable, but still regularly bugfixed branch without having all the excitement of living on master and having old features pulled from under you while the new features aren't quite there yet. If any larger bugs crop up, you can always tag a sub-release on maint and create a package for anyone not using git. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Factory and User Sound Singles for Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds