Can't PR: 500 Server Error

I’m not positive this is the place to post this, but I’m trying to make a Pull Request from a branch on my fork of the main Blender repo, but the thing gives me a 500 Internal Server Error screen every time I try. I’ve synced changes, it’s up to date, but any time I try to PR from any branch on my fork, it yells at me. It used to work fine a few months ago.

What have I done?

I can reproduce the problem by going to the URL: http://projects.blender.org/blender/blender/compare/main...Jordan-Henshaw/blender:graph-editor-view-selected-one-only

Maybe I named the branch with not enough zebras and too many unicorns?

This one works for me: Jordan-Henshaw/blender: Blender fork. - blender - Blender Projects

@bartvdbraak I think there is something wrong with the Jordan-Henshaw/blender.git repo.

exit status 128 - error: could not lock config file config: File exists

Maybe removing a config.lock file there will help. Might be leftover from some failed operation.

OK, I think what might have happened is I’m supposed to have my fork locally on my machine, not the official Blender one. I recently had to gut my entire Blender oven and start from nothing using the official instructions, which had me use the official Blender url. But I think to actually actively contribute and have VSCode push directly to the internet (like it does for my GitHub add-on), it’s way easier to have my fork downloaded locally and remember to push origin regularly. That way, 90% of my Blender dev time is not spent dealing with Gitea’s gui.

So maybe this is part of the reason this thing hates me, because I’m doing it wrong. And I should just delete the broken fork and start over with a new one, and use that new one locally on my machine.

@Jordan_Henshaw I don’t think you did anything wrong. It shouldn’t be possible to break things in Gitea like this, no matter which setup you use. And it sounds like a pretty normal setup anyway.

Hi @Jordan_Henshaw,

The issue was indeed a server-side lockfile which Gitea failed to clean up. It was created around the time of our server migration last year December so it was most likely caused by that. I am fairly sure that no actions of yours have played a role in this issue occurring.

@brecht I found such lock files for the same date on two other repos (kevincburke/blender-buildbot-www.git and shaneambler/blender-addons) which I’ve cleaned up accordingly.

There is an open upstream issue for this here

1 Like

It works! Thanks so much!

1 Like