From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [REQ/DISCUSSION] patch managing system Date: Wed, 23 Mar 2016 12:02:17 -0400 Message-ID: <20160323160217.GB2063@jasmine> References: <87h9g0eq1c.fsf@grrlz.net> <87d1qogcfw.fsf@grrlz.net> <87h9fz7pe0.fsf@gnu.org> <87egb2ybhy.fsf@grrlz.net> <8760wetr5f.fsf@gnu.org> <87mvppvm4g.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ailEi-0007gY-UF for guix-devel@gnu.org; Wed, 23 Mar 2016 12:02:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ailEe-0003Ny-Oq for guix-devel@gnu.org; Wed, 23 Mar 2016 12:02:20 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52443) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ailEe-0003NS-LQ for guix-devel@gnu.org; Wed, 23 Mar 2016 12:02:16 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 61BEA21763 for ; Wed, 23 Mar 2016 12:02:15 -0400 (EDT) Content-Disposition: inline In-Reply-To: <87mvppvm4g.fsf@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Chris Marusich Cc: guix-devel@gnu.org, Nils Gillmann On Tue, Mar 22, 2016 at 09:44:47PM -0700, Chris Marusich wrote: > > While we're talking about patches, I'm curious: how are other people > managing the patches? In particular, what does the workflow look like > for people who are committing? Do you manually download the patch (or > patches) to a temporary folder, view it/them, and if you like what you > see, commit it with "git am" to a local repo, then push to origin? > > I ask because when I see a patch on the email list, there seems to be a > bit of manual work involved in actually committing it into a local repo. I normally read the patches in mutt. For application, it varies a bit depending on how many patches there are and if they are in the same thread, from different people, etc. For single patches I can use mutt's pipe command (press | in mutt) and pipe to 'cd ~/guix && git am`. If there are multiple messages, I tag the messages that contain the patches I want to apply, and then save all the tagged messages to a temporary mailbox ~/foo. Then, I just use `git am ~/foo`. It gets a bit messy if contributors have not used git-send-email. I bet this workflow be improved with some macros, or by using Emacs ;) But, applying patches is definitely not a bottleneck for me yet.