How to upload a diff based on a specific version of blender?

Contributing to Blender
1

I cloned the blender-v3.3-release branch from the official blender git.

I made some edits and created a diff patch form the original branch.

If I wanted to submit the diff to developer.blender.org/, I’d go to the following page: Developer Portal - developer.blender.org

How do I specify that it’s a diff from the blender-v3.3-release branch, and not the master?

I can’t work on master because I’m working on a new Grease Pencil addon, and as they add more addons my code stops working so I decided to use the 3.3 LTS version of blender to develop my patch.

2

Add tag Blender 3.3? (I aslo not sure)

3

We’re not adding any new functionality to 3.3 LTS, that version is only getting bugfixes backported from master. So if this is intended to be a contribution to be shipped with Blender it should be targeted for master.

When using arc diff it will remember the parent commit and apply the patch against that. There is no way to specify a branch name.
https://wiki.blender.org/wiki/Tools/CodeReview#Use_Arcanist

4

We’re not adding any new functionality to 3.3 LTS, that version is only getting bugfixes backported from master. So if this is intended to be a contribution to be shipped with Blender it should be targeted for master.

It’s not, as I explained, it is intended to be a safe work-in-progress enviroment to be eventually merged in the latest verion of Blender. Don’t worry!

5

When using arc diff it will remember the parent commit and apply the patch against that. There is no way to specify a branch name.

So what is the correct workflow if I don’t have Arcanist? How do I publish my work in progress patch, in a way that it can alway be applied and not compromised by latest commits?

6

When not using arc, the only way is to say in the description which branch the patch should be manually applied on.

1 Like