From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: heads-up: Haskell updates Date: Fri, 16 Feb 2018 17:31:19 +0100 Message-ID: <87po54vqug.fsf@fastmail.com> References: <87r2ppjbst.fsf@elephly.net> <873723pfya.fsf@netris.org> <871shn8jm5.fsf@elephly.net> <87zi4b744f.fsf@elephly.net> <20180214234721.4e9fe198@scratchpost.org> <87a7waodaa.fsf@netris.org> <20180215120404.0a96b628@scratchpost.org> <87fu626yvj.fsf@elephly.net> <20180215180340.52db6ded@scratchpost.org> <20180216162642.106e9c7c@scratchpost.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emiv6-0000S5-Ts for guix-devel@gnu.org; Fri, 16 Feb 2018 11:31:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emiv2-0004aZ-UE for guix-devel@gnu.org; Fri, 16 Feb 2018 11:31:32 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:53105) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1emiv2-0004a8-OR for guix-devel@gnu.org; Fri, 16 Feb 2018 11:31:28 -0500 In-Reply-To: <20180216162642.106e9c7c@scratchpost.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Danny Milosavljevic , Ricardo Wurmus Cc: guix-devel --=-=-= Content-Type: text/plain Danny Milosavljevic writes: > git am just failed because the index is not matching. > > So I'll not push my core-updates. > > Next, I tried git merge origin/master which gave me a number of merge conflicts. > > One of those is gnu/local.mk: > > + %D%/packages/patches/gettext-multi-core.patch \ > + %D%/packages/patches/gettext-gnulib-multi-core.patch \ > > These referred files haven't been merged into core-updates by my action above. > > Why? If you do `git show a124e4258ad91`, which is the commit that adds "ghc-8.0-fall-back-to-madv_dontneed.patch" to local.mk, you'll see these files in the "context" of the change. However these files have been deleted on core-updates. So when git tries to merge a124e4258ad91, it can't find this "context" and instead adds it so that the commit applies cleanly. The solution in this case is to delete these unwanted lines from local.mk (again) and use "git commit" to conclude the merge. However there are two other conflicts. The emacs.scm one is easy, but the python.scm conflict requires adjusting the bpython context to be after the packages that were recently appended to python.scm on core-updates. Should we do a new merge to get the GHC patch, or just merge core-updates and let the problem "fix itself" on 'master'? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqHB1cACgkQoqBt8qM6 VPq8OQf7B7Zu8u1A5Or2ue0r6orNZa+o7mIwJUqhwaM002KZBSe8bS43QPe+6rF5 8Dwo3Q3V80/oDklaqqcBqA7J+WXLodXAsKf8fy9lPauNM3J8K42nShCXxpypWecD ZyFIDlSNC/zVpKYjdaWdge3+OWlF7Rfl1d33HI/Bc0PQUrTwLAH6gvFnLl4/inMt fX4ngBmaqLZCyWaXE6UzYIdBSdSNogNM0SmpMH3fLz/5nf7yHUPYZYdYhiBnSl3W 3+S9MEg3d4XNvla9n5xRFn3vEenip88OQuJPdsTDCsmRj7ER2eLrys8rpL9dDIug FP4YymYX1WHQYXMZCeO+cCwZkSU6zA== =n+xd -----END PGP SIGNATURE----- --=-=-=--