unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Andreas Enge <andreas@enge.fr>
To: Csepp <raingloom@riseup.net>
Cc: guix-devel@gnu.org
Subject: Re: splitting up and sorting commits?
Date: Sun, 6 Nov 2022 10:59:32 +0100	[thread overview]
Message-ID: <Y2eFhP/VphuioZID@jurong> (raw)
In-Reply-To: <87cza65i1z.fsf@riseup.net>

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



  parent reply	other threads:[~2022-11-06 10:00 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-02  0:05 splitting up and sorting commits? Csepp
2022-11-02 14:43 ` zimoun
2022-11-03 20:59 ` Liliana Marie Prikler
2022-11-04  9:20   ` zimoun
2022-11-04 17:53     ` Liliana Marie Prikler
2022-11-06  9:59 ` Andreas Enge [this message]
2022-11-06 12:19   ` Csepp

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Y2eFhP/VphuioZID@jurong \
    --to=andreas@enge.fr \
    --cc=guix-devel@gnu.org \
    --cc=raingloom@riseup.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).