From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kyle Meyer Subject: Re: [PATCH] Fix the single quote printed in the message printed by org-table-edit-formulas Date: Fri, 11 Mar 2016 13:47:45 -0500 Message-ID: <877fh8yhpq.fsf@kyleam.com> References: <87oaamuw2q.fsf@kyleam.com> <56E221EA.4080106@cs.ucla.edu> <87egbhab5x.fsf@kyleam.com> <8737rxa97v.fsf@kyleam.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeS6M-0001gw-6B for emacs-orgmode@gnu.org; Fri, 11 Mar 2016 13:47:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeS6I-0002nS-Vo for emacs-orgmode@gnu.org; Fri, 11 Mar 2016 13:47:54 -0500 Received: from pb-smtp0.int.icgroup.com ([208.72.237.35]:54695 helo=sasl.smtp.pobox.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeS6I-0002n9-PA for emacs-orgmode@gnu.org; Fri, 11 Mar 2016 13:47:50 -0500 In-Reply-To: (Kaushal Modi's message of "Fri, 11 Mar 2016 12:44:48 -0500") 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: Kaushal Modi Cc: Paul Eggert , emacs-org list Kaushal Modi writes: > Patch (after rebasing to 5a735b0) attached. I hope it works. Thanks. It almost works :) Applying the patch fails because there's a whitespace change in one of the context lines (the first one above the org-table-align change). You should be able to see the same failure on your end if you make a test branch off of maint and then try to apply your patch. But the patch applies fine with the --ignore-whitespace flag to git am, so there is no need to resend it. I'll have another look at the changes tonight and will push it then unless there are more comments from me or others. > Git newbie question: > > Making the changes in the maint version of these 4 files manually was a bit > of a pain. What's the right way of porting changes from one branch to > another? You can rebase the patch branch from master to maint. From Magit, you can use the magit-rebase-subset command ("rs"). From the command line, you could do something like git rebase --onto maint master Since in this case the branch only consists of one commit, you could also just make a new branch off of maint and cherry pick the commit from the original branch. In either case, Git will let you know if there are any conflicts you need to resolve. > I am curious how the changes will be ported from the maint branch > to the master branch. I'll merge maint into master. -- Kyle