all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel <guix-devel@gnu.org>
Subject: Re: core-updates vs. core-updates-next
Date: Sat, 28 May 2016 12:04:35 -0400	[thread overview]
Message-ID: <20160528160435.GB16585@jasmine> (raw)
In-Reply-To: <87a8jajiq0.fsf@gnu.org>

On Sat, May 28, 2016 at 05:38:31PM +0200, Ludovic Courtès wrote:
> > Okay, do you think I should move the commits from core-updates-next to
> > core-updates?
> 
> Yes, please!  Just cherry-picking them and that should be fine.

Both patches can't be cherry-picked smoothly. In both cases, there have
been other changes to the packages on core-updates that are not present
on core-updates-next. Even if I resolve the conflicts while
cherry-picking, I think we will get conflicts again whenever we merge
what is now core-updates-next.

For expat, it was updated to 2.1.1, and for libxslt, the docs were made
to build reproducibly.

So, even though it will look a bit messy in the logs, I wonder if it's
best to revert them on core-updates-next and manually recreate the
changes on core-updates?

And in the future, I will *definitely* check for this situation before
pushing changes to a ...-next branch.

      reply	other threads:[~2016-05-28 16:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20160526173645.9317.58057@vcs.savannah.gnu.org>
     [not found] ` <20160526173645.520A2220153@vcs.savannah.gnu.org>
2016-05-27  8:14   ` core-updates vs. core-updates-next Ludovic Courtès
2016-05-27 14:56     ` Leo Famulari
2016-05-28 15:38       ` Ludovic Courtès
2016-05-28 16:04         ` Leo Famulari [this message]

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

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

  git send-email \
    --in-reply-to=20160528160435.GB16585@jasmine \
    --to=leo@famulari.name \
    --cc=guix-devel@gnu.org \
    --cc=ludo@gnu.org \
    /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 external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.