From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo Famulari <leo@famulari.name>
Subject: Re: core-updates vs. core-updates-next
Date: Sat, 28 May 2016 12:04:35 -0400
Message-ID: <20160528160435.GB16585@jasmine>
References: <20160526173645.9317.58057@vcs.savannah.gnu.org>
	<20160526173645.520A2220153@vcs.savannah.gnu.org>
	<87bn3rx6i6.fsf_-_@gnu.org> <20160527145635.GA21969@jasmine>
	<87a8jajiq0.fsf@gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60167)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1b6gjN-0006eH-AP
	for guix-devel@gnu.org; Sat, 28 May 2016 12:04:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1b6gjI-0000Un-8M
	for guix-devel@gnu.org; Sat, 28 May 2016 12:04:53 -0400
Content-Disposition: inline
In-Reply-To: <87a8jajiq0.fsf@gnu.org>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: Ludovic =?iso-8859-1?Q?Court=E8s?= <ludo@gnu.org>
Cc: guix-devel <guix-devel@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.