From: Marius Bakke <mbakke@fastmail.com>
To: Leo Famulari <leo@famulari.name>
Cc: 25177@debbugs.gnu.org
Subject: bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.
Date: Sat, 14 Jan 2017 16:35:24 +0100 [thread overview]
Message-ID: <87wpdx4ptv.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> (raw)
In-Reply-To: <20170113152400.GA24322@jasmine>
[-- Attachment #1: Type: text/plain, Size: 1293 bytes --]
Leo Famulari <leo@famulari.name> writes:
> 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!
>>
>> $ git reset --hard savannah/python-tests
>> $ git merge master
>> $ <fix two conflicts>
>> $ 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.git'
>
> 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.
>>
>> 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.
Thank you for this! You are of course completely right, I had forgotten
about the hook already. I'll see if I can make it fail in a less
misleading way :-)
Can you start a new evaluation on Hydra or Cuirass, once the matplotlib
commit is in?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2017-01-14 15:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170105161431.9803-1-dannym@scratchpost.org>
[not found] ` <878tqpjw93.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me>
2017-01-13 12:34 ` bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8 Marius Bakke
2017-01-13 13:07 ` Danny Milosavljevic
2017-01-13 15:24 ` Leo Famulari
2017-01-14 15:35 ` Marius Bakke [this message]
2017-01-16 1:32 ` Leo Famulari
2017-01-17 0:06 ` Leo Famulari
2017-01-13 22:14 ` Danny Milosavljevic
2017-01-14 13:54 ` Danny Milosavljevic
2017-01-14 15:28 ` Marius Bakke
2017-01-14 21:08 ` Danny Milosavljevic
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wpdx4ptv.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me \
--to=mbakke@fastmail.com \
--cc=25177@debbugs.gnu.org \
--cc=leo@famulari.name \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).