From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8. Date: Fri, 13 Jan 2017 10:24:00 -0500 Message-ID: <20170113152400.GA24322@jasmine> References: <20170105161431.9803-1-dannym@scratchpost.org> <878tqpjw93.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <8760lj5eb6.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="82I3+IH0IqGh5yIs" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS3j3-00028T-Pf for bug-guix@gnu.org; Fri, 13 Jan 2017 10:25:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cS3iy-0007Qy-Rb for bug-guix@gnu.org; Fri, 13 Jan 2017 10:25:09 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:37629) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cS3iw-0007PH-Mo for bug-guix@gnu.org; Fri, 13 Jan 2017 10:25:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cS3iw-0006KL-CZ for bug-guix@gnu.org; Fri, 13 Jan 2017 10:25:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: Content-Disposition: inline In-Reply-To: <8760lj5eb6.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Marius Bakke Cc: 25177@debbugs.gnu.org --82I3+IH0IqGh5yIs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jan 13, 2017 at 01:34:21PM +0100, Marius Bakke wrote: > Leo: I'm unable to reproduce the Hydra failures, so I decided to merge > master so we can restart this branch. However, Savannah refuses the push > for no good reason! >=20 > $ git reset --hard savannah/python-tests > $ git merge master > $ > $ git push -v savannah python-tests > Pushing to mbakke@git.sv.gnu.org:/srv/git/guix.git > error: failed to push some refs to 'mbakke@git.sv.gnu.org:/srv/git/guix.g= it' I bet that you are using the new pre-push hook that verifies commit signatures, and you're trying to push some commits that fail the signature verification check. Someone should add some error reporting to the hook. > Any ideas? The merged branch is 687 commits ahead. >=20 > You can try the merge yourself, the local.mk conflict is easy and in > bioinformatics.scm you want to keep [arguments] and not [native-inputs]. Done with the hook disabled. > I suppose we could rebase it and force-push, but it seems heavy-handed. IMO we should avoid it when possible; rebasing loses the original signatures. --82I3+IH0IqGh5yIs Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlh48RAACgkQJkb6MLrK fwjgvhAAmSJvE4kG7N+sPk/rVf2DAfehbaE+7K3WQDXgLo1SXES5fUpIVMcHcY58 BzWQd6smlTbQcZnZnIuARVo47BlR5IwHj8hwyWAIXdXhTFUyEEQphNKhrt1Qn0oY JCjMZTVm0c062mIx6sRtE5gf9bK9kYFPxg60F+nlaMK5V0tmoPE1suW2P3gBb4IC vXILB3wQfTxTl/KK2+ItqOXrQK1PTllSGYSaroH7pU5eWhukYV+mXwkpO3SmmRpn w3YlIMHkqkxR7EUcoXpNDNwOxy7edDa16oHs23FNl/frSF62bnB7KrGn/xt4IBgm SibWbRQLIsa0t4VdYVibzkyAqSZMyJxNKUpcx5VXiTFH+aIgEQmx5SzMlZFlSmjk QISFfjrgSjyWkWZAp4Dp83kzOp5bDhUO1ipJuilJ8Gs09qhmzplaPdiZwoCIpAas iyfyFF9/K595Eqlv4JAw+LEP9qL59fc6t3v4bbs8hNETn8qNrcn3HIu8KdQQKMuK sy6iPwaa+/YeHwYn3lcqG7YZi2a7DtqobFY5S2FhL8vf5r8S8lRDRptlYZdyF2SP r5DebglAndWpq3TNkDswoTuAEJ9/VQRTPvvS8M73LH4l5gylFPGnsjzJampMu6nG QtFnmr/UJ7SapQX2sg4VmWtf14+r+bs4dYQtSooid1akMBl7X40= =BM2x -----END PGP SIGNATURE----- --82I3+IH0IqGh5yIs--