unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Roel Janssen <roel@gnu.org>
To: zimoun <zimon.toutoune@gmail.com>
Cc: Guix Devel <guix-devel@gnu.org>
Subject: Re: Updating to latest Bioconductor release
Date: Thu, 19 Nov 2020 17:25:41 +0100	[thread overview]
Message-ID: <0f3a95cbcbefec60a9a239f39eefa7a991272dc9.camel@gnu.org> (raw)
In-Reply-To: <CAJ3okZ2izEzRkARnwUZPU8AJ965a9GYB9+ssM89_rQefNeuiwg@mail.gmail.com>

On Thu, 2020-11-19 at 17:18 +0100, zimoun wrote:
> On Thu, 19 Nov 2020 at 16:57, Roel Janssen <roel@gnu.org> wrote:
> 
> > My bad, I jumped to a conclusion too quickly. :)
> 
> No worries. :-)
> 
> 
> > So, *something* removed my commits to the wip-r branch. Is it some
> > kind
> > of automation that syncs the Github and the Savannah branches?
> 
> Which upstream?
> I have no access on Savannah.  And I think you could should there.
> My wip-r branch on my personal GitHub account, no automation. 
> Ricardo
> did couple of days ago: fetch my branch and push it to Savannah. 
> Then
> they reported a tiny mistake that I corrected on my branch, by
> rewriting the history since it is WIP.  It was before you have
> started
> to work on, I guess.
> 
> To be concrete, the last commit on my branch is 9 days ago.  And the
> last commit on Savannah wip-r is 30th Otc.

Yeah, because mine got removed.

> > The good news is that in my local checkout I've fixed the build
> > problem
> > with r-rhdf5lib, so I should be able to build the remaining
> > packages
> > this evening.
> 
> Really cool!  Thank you.
> 
> 
> > I am hesitant to push it to the "wip-r" branch, because it seems
> > pointless. :)  So where can I push my updates to?
> 
> Please push your changes to wip-r on Savannah, rewriting the history
> is fine with me.  Then Cuirass will rebuild everything, check.  Then
> we can merge to master.

Well, they got removed from Savannah. Now I get this when I try to
push:
$ git push -f origin wip-r
Enumerating objects: 1599, done.
Counting objects: 100% (1599/1599), done.
Delta compression using up to 4 threads
Compressing objects: 100% (362/362), done.
Writing objects: 100% (1590/1590), 359.31 KiB | 14.37 MiB/s, done.
Total 1590 (delta 1271), reused 1545 (delta 1228), pack-reused 0
remote: error: denying non-fast-forward refs/heads/wip-r (you should
pull first)
To git.savannah.gnu.org:/srv/git/guix.git
 ! [remote rejected]       wip-r -> wip-r (non-fast-forward)
error: failed to push some refs to
'git.savannah.gnu.org:/srv/git/guix.git'

So, that's not going to work. 
Perhaps @Ricardo knows more about the setup of the "wip-r" branch.

Kind regards,
Roel Janssen




  reply	other threads:[~2020-11-19 16:26 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-16 10:49 Updating to latest Bioconductor release Roel Janssen
2020-11-16 11:27 ` zimoun
2020-11-16 12:10   ` Roel Janssen
2020-11-16 12:29     ` zimoun
2020-11-16 12:38       ` Roel Janssen
2020-11-16 12:59         ` zimoun
2020-11-17 22:58 ` zimoun
2020-11-18  9:31   ` Roel Janssen
2020-11-18 11:50     ` zimoun
2020-11-18 16:13       ` Roel Janssen
2020-11-18 16:23         ` zimoun
2020-11-18 16:33           ` Roel Janssen
2020-11-18 16:59             ` zimoun
2020-11-19 15:31               ` Roel Janssen
2020-11-19 15:36                 ` zimoun
2020-11-19 15:57                   ` Roel Janssen
2020-11-19 16:18                     ` zimoun
2020-11-19 16:25                       ` Roel Janssen [this message]
2020-11-19 16:36                         ` zimoun
2020-11-19 17:27                         ` zimoun
2020-11-19 19:03                           ` Roel Janssen
2020-11-19 19:18                             ` zimoun
2020-11-19 21:13                               ` Ricardo Wurmus
2020-11-20  9:16                                 ` Roel Janssen
2020-11-20 13:39                                   ` Ricardo Wurmus
2020-11-20 13:42                                     ` Ricardo Wurmus
2020-11-20 14:02                                       ` zimoun
2020-11-20 14:10                                       ` Roel Janssen
2020-11-20 13:59                                     ` zimoun
2020-11-20 14:28                                       ` Ricardo Wurmus
2020-11-20 15:20                                         ` zimoun

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=0f3a95cbcbefec60a9a239f39eefa7a991272dc9.camel@gnu.org \
    --to=roel@gnu.org \
    --cc=guix-devel@gnu.org \
    --cc=zimon.toutoune@gmail.com \
    /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).