From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: Re: Ungrafting Date: Mon, 02 May 2016 09:34:34 -0400 Message-ID: <87shy0vb11.fsf@netris.org> References: <20160501202057.GB7127@jasmine> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axE0N-00032e-8c for guix-devel@gnu.org; Mon, 02 May 2016 09:35:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axE0B-0004KL-Ih for guix-devel@gnu.org; Mon, 02 May 2016 09:35:13 -0400 Received: from world.peace.net ([50.252.239.5]:50529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axE0B-0004Cl-Fb for guix-devel@gnu.org; Mon, 02 May 2016 09:35:07 -0400 In-Reply-To: <20160501202057.GB7127@jasmine> (Leo Famulari's message of "Sun, 1 May 2016 16:20:57 -0400") 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" To: Leo Famulari Cc: guix-devel@gnu.org Leo Famulari writes: > When committing a bug fix with a graft, I think it would be a good idea > to follow up on some other branch with a commit that makes the same > change without a graft. > > Core-updates was suggested on IRC. This would mean that after each graft > commit, master would need to be merged into core-updates, and then the > "ungrafting" patch could be applied. Merging those two will be awkward. In my experience, the result of git automatically merging these two commits is to update the main package *and* to graft it. For this reason, I think it's preferable for the ungrafted commit to be on top of the grafted one, i.e. it should remove the graft and update the origin package in a single commit. In practice, this means that after applying the graft to master, master should be merged into core-updates before applying the ungrafting commit to core-updates. What do you think? Mark