GNU bug report logs - #30572
[PATCH 0/7] Add "guix system docker-image" command

Previous Next

Full log

Message #29 received at 30572 <at> debbugs.gnu.org (full text, mbox):

From: Chris Marusich <cmmarusich <at> gmail.com>
To: 30572 <at> debbugs.gnu.org
Subject: Re: [bug#30572] [PATCH 3/7] system: Allow customization of the
 initrd's Guile.
Date: Thu, 22 Feb 2018 13:10:33 +0100

[Message part 1 (text/plain, inline)]

Chris Marusich <cmmarusich <at> gmail.com> writes:

> +<<<<<<< HEAD
>                        #:volatile-root? '#$volatile-root?
>                        #:on-error '#$on-error)))
>     #:name "raw-initrd"))
> +=======
> +                      #:volatile-root? '#$volatile-root?)))
> +   #:name "raw-initrd"
> +   #:guile guile))
> +>>>>>>> system: Allow customization of the initrd's Guile.
>
> ...
>
> +<<<<<<< HEAD
>                #:on-error on-error))
> +=======
> +              #:guile guile))
> +>>>>>>> system: Allow customization of the initrd's Guile.

This is obviously not correct.  I accidentally forgot to resolve these
conflicts when rebasing my branch onto origin/master.  Please disregard
patch 3/7 in favor of the attached patch, which resolves the conflicts.

I've verified (for sure, this time!) that this patch series builds
successfully after it has been applied.  Sorry for the additional churn!

-- 
Chris

[0003-system-Allow-customization-of-the-initrd-s-Guile.patch (text/x-patch, attachment)]

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.