Hi Danny,

Those 4 commits mean that someone pulling right now from a pre-migration
Guix will end up in a branch that only exists there, and the next ‘guix
pull’ will error out due to non-fast-forward update.

Danny Milosavljevic <dan...@friendly-machines.com> writes:

> I think the best course of action would be to force push without the four 
> commits on savannah.
>
> The idea being that mirroring will hopefully just resume where it was before.
>
> Unfortunately, I'm not allowed to do that.

I previously filed a request to support force-push precisely to
“unbreak” mirroring but that hasn’t been fruitful yet:

  https://savannah.nongnu.org/support/?111250

Previously, since Savannah doesn’t let us force-push, we would delete
and then push the branch, but that doesn’t work for the main branch:

--8<---------------cut here---------------start------------->8---
remote: error: By default, deleting the current branch is denied, because the 
next        
remote: 'git clone' won't result in any file checked out, causing confusion.    
    
remote: 
remote: You can set 'receive.denyDeleteCurrent' configuration variable to       
 
remote: 'warn' or 'ignore' in the remote repository to allow deleting the       
 
remote: current branch, with or without a warning message.        
remote: 
remote: To squelch this message, you can set it to 'refuse'.        
remote: error: refusing to delete the current branch: refs/heads/master        
To ssh://git.sv.gnu.org/srv/git/guix.git
 ! [remote rejected]         master (deletion of the current branch prohibited)
error: failed to push some refs to 'ssh://git.sv.gnu.org/srv/git/guix.git'
--8<---------------cut here---------------end--------------->8---

I’ve joined #savannah on Libera.Chat asking for help.

> About openscad not building???, I have tested it and it builds and
> runs fine for me.  Anyway, will investigate that after fixing this
> push snafu first.

Please go through the normal review process so people and QA have a
chance to test and comment.

Thanks,
Ludo’.

Reply via email to