From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id wKsyNKeFZ2PyvwAAbAwnHQ (envelope-from ) for ; Sun, 06 Nov 2022 11:00:07 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id IMVGM6eFZ2PHFAAAG6o9tA (envelope-from ) for ; Sun, 06 Nov 2022 11:00:07 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6CE2E4EA6 for ; Sun, 6 Nov 2022 11:00:07 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orcRK-00064d-WF; Sun, 06 Nov 2022 04:59:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orcRJ-00064B-AS for guix-devel@gnu.org; Sun, 06 Nov 2022 04:59:41 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orcRH-0002uN-BM for guix-devel@gnu.org; Sun, 06 Nov 2022 04:59:41 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 07DB97BA; Sun, 6 Nov 2022 10:59:35 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lXOo092S9gac; Sun, 6 Nov 2022 10:59:34 +0100 (CET) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 74DF7205; Sun, 6 Nov 2022 10:59:34 +0100 (CET) Date: Sun, 6 Nov 2022 10:59:32 +0100 From: Andreas Enge To: Csepp Cc: guix-devel@gnu.org Subject: Re: splitting up and sorting commits? Message-ID: References: <87cza65i1z.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87cza65i1z.fsf@riseup.net> Received-SPF: pass client-ip=2a0c:e300::1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Guix-devel" Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1667728807; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=mUhjGbjDD6Ls5t3sBwf9cJtg6ISF1M/JFDpKTkBGs48=; b=kWAYORvNDdxYjwoFA4lloXClhEA5iRv/EqC8oVD6ksMgS0sQSc7luN35h8Y8VnOwosBhTa DEzxPKHlLCR3lJv4MYZe496CUwod22jtOj21jjkbPLjY2ZBouH5g1g7AL6dbQz7vN6P+Xu VSiLPDq4k7KrM05MUyZTm8zAfHsXdvWeTpzsiKg6mEcTrHKmTFdn3RZEQ9iv45qeWi3dfT lhe7WAn7MGJVlleXvnKGSPYM2rrmKh21NZL+e162qs8ODRfSGG2PCu4eADkHuaNnhpzMmf eLkUSO3ohhoCtgNAHysFHB8js7tI9tcJkvFQMOqY02AtnG8ylT4TGKQx7+Z6vQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1667728807; a=rsa-sha256; cv=none; b=Uyjlz7Ei8RoH6OKVeGo+ItEz5FqBvJBhUUhB8AC4Xllai6spLyq1kEubVeGcpzDNcTrEvG PE5AJzQW+G+Ersvd9jH5a7H1AQDB0UWCy0ecT4We4LhJq4SzCFhH34/bkubRAKEGDkdJjm icQFo85IH63P9vhQpGcCSkNyZIJF5zhBU18Chh0A/D9zycLpoTbqwaGD9q3i5faPbPnW0r qZklkO2U9u0pbeOz2sjX72u46vGE7Ax2+268nymp2LzwlZmTZy41XM4DAbMa/2uEysZ4JH CNVzQyS1WeuOC8YE85sBS88lcgo2aESfmO2ebHBKSXerTdqb9c14QCX5OhIFhg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 0.20 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 6CE2E4EA6 X-Spam-Score: 0.20 X-Migadu-Scanner: scn1.migadu.com X-TUID: auLa2KKmT2IR Hello, Am Wed, Nov 02, 2022 at 12:05:54AM +0000 schrieb Csepp: > * It is very easy for package to get added before their dependencies, so > even though by the end of the commit chain everything builds perfectly > fine, there are intermediate commits that can't be tested on their own. maybe it can be handled by a different workflow? I usually use the git stash to perform a depth first traversal of the dependency graph like so: - Add package A. Try to build it and see that it needs dependency B. "git stash". - Add package B *instead*. Try to build it... (da capo ad libitum) - "git commit" with package B. - "git stash pop". Try to build package A etc. - "git commit" with package A. The only drawback is that B and A are often defined next to each other, which creates a spurious merge conflict during "git stash pop", but that is easy to solve and requires an additional "git stash drop" in the end. Sometimes I even give up on package A in the end, but then at least B has been added to Guix :) Andreas