From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Schulte Subject: Re: [babel][bug] org-babel-balanced-split (with Emacs-22) Date: Tue, 03 Jan 2012 13:57:00 -0700 Message-ID: <87boqksdwj.fsf@gmx.com> References: <87hb0cu1bb.fsf@gmx.com> <8739bwtyiu.fsf@gmx.com> <8739bwr582.fsf@Rainer.invalid> <87r4zgsiud.fsf@gmx.com> <87y5topp4c.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([140.186.70.92]:34029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiBPz-0007y3-QT for emacs-orgmode@gnu.org; Tue, 03 Jan 2012 15:57:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RiBPy-00034a-8e for emacs-orgmode@gnu.org; Tue, 03 Jan 2012 15:57:11 -0500 Received: from mailout-us.gmx.com ([74.208.5.67]:44005) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1RiBPy-00034U-28 for emacs-orgmode@gnu.org; Tue, 03 Jan 2012 15:57:10 -0500 In-Reply-To: <87y5topp4c.fsf@Rainer.invalid> (Achim Gratz's message of "Tue, 03 Jan 2012 20:22:59 +0100") 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: Achim Gratz Cc: emacs-orgmode@gnu.org Achim Gratz writes: > Eric Schulte writes: >> Yes, I'm now pushing bug-fix commits to maint as well as master. > > That way you duplicate the commit (the same change now has two ID). > I think it would be preferrable to push bugfixes to maint and then merge > maint back into master. > Alright, that does sound preferable. I'll leave the previous commits as is so as not to force a non-fast-forward commit, but moving forward I'll commit bug fixes to maint and then merge maint into master. Thanks, > > > Regards, > Achim. -- Eric Schulte http://cs.unm.edu/~eschulte/