On Thu, 2020-11-19 at 17:18 +0100, zimoun wrote: > On Thu, 19 Nov 2020 at 16:57, Roel Janssen <r...@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