... jangoproject.com . Post the blog entry and send out the email announcements. Update version numbers post-release in stable branch(es). Add stub release notes for the next patch release in main and backport. There are a lot of details, so please read on ... $ cve --interactive reserve <quantity> Generate the relevant (private) patch(es) using git format-patch , one for the main branch and one for each stable branch being patched. A week before a security release ¶ Send out pre-notification exactly one wee ... on recipients, and be sure to include the relevant CVE IDs. Attach all the relevant patches (targeting main and the stable branches), and sign the email text with the key you'll use for the release, with a command like: $ gpg --clearsign --digest-algo ... ... jangoproject.com . Post the blog entry and send out the email announcements. Update version numbers post-release in stable branch(es). Add stub release notes for the next patch release in main and backport. There are a lot of details, so please read on ... $ cve --interactive reserve <quantity> Generate the relevant (private) patch(es) using git format-patch , one for the main branch and one for each stable branch being patched. A week before a security release ¶ Send out pre-notification exactly one wee ... on recipients, and be sure to include the relevant CVE IDs. Attach all the relevant patches (targeting main and the stable branches), and sign the email text with the key you'll use for the release, with a command like: $ gpg --clearsign --digest-algo ... ... it remote add akaariai https://github.com/akaariai/django.git Working on a ticket ¶ When working on a ticket, create a new branch for the work, and base that work on upstream/main : git checkout -b ticket_xxxxx upstream/main The -b flag creates a new b ... ranch for you locally. Don't hesitate to create new branches even for the smallest things - that's what they are there for. If instead you were working for a fix on the 1.4 branch, ... you would do: git checkout -b ticket_xxxxx_1_4 upstream/stable/1.4.x Assume the work is carried on the ticket_xxxxx branch. Make some changes and commit them: git commit When writing the commit message, follow the commit message guidelines to ea ... ... it remote add akaariai https://github.com/akaariai/django.git Working on a ticket ¶ When working on a ticket, create a new branch for the work, and base that work on upstream/main : git checkout -b ticket_xxxxx upstream/main The -b flag creates a new b ... ranch for you locally. Don't hesitate to create new branches even for the smallest things - that's what they are there for. If instead you were working for a fix on the 1.4 branch, ... you would do: git checkout -b ticket_xxxxx_1_4 upstream/stable/1.4.x Assume the work is carried on the ticket_xxxxx branch. Make some changes and commit them: git commit When writing the commit message, follow the commit message guidelines to ea ... ... It contains the full source code for all Django releases, which you can browse online. The Git repository includes several branches : main contains the main in-development code which will become the next packaged release of Django. This is where most d ... evelopment activity is focused. stable/A.B.x are the branches where release preparation work happens. They are also used for bugfix and security releases which occur as necessary aft ... ed work . The source code for the Djangoproject.com website can be found at github.com/django/djangoproject.com . The main branch ¶ If you'd like to try out the in-development code for the next release of Django, or if you'd like to contribute to Djang ... ... It contains the full source code for all Django releases, which you can browse online. The Git repository includes several branches : main contains the main in-development code which will become the next packaged release of Django. This is where most d ... evelopment activity is focused. stable/A.B.x are the branches where release preparation work happens. They are also used for bugfix and security releases which occur as necessary aft ... ed work . The source code for the Djangoproject.com website can be found at github.com/django/djangoproject.com . The main branch ¶ If you'd like to try out the in-development code for the next release of Django, or if you'd like to contribute to Djang ... ... s". Your username will be filled in the text box by default. See "Claiming" tickets for the full documentation. Creating a branch for the ticket ¶ How you create your branch depends on whether the ticket already has work attached to it. Starting fresh ... ¶ With the ticket claimed, create a branch for your work, replacing TicketNumber with the actual Trac ticket number: / $ git fetch upstream $ git checkout -b tic ... am/main ...\> git fetch upstream ...\> git checkout -b ticket_TicketNumber upstream/main When your work is ready, push the branch to your fork and open a pull request. See Submitting contributions for the full process. Continuing someone else's work ¶ ... ... l be pushed to upstream. $ git push --dry-run upstream main $ # Push! $ git push upstream main $ # Delete the pull request branch. $ git branch -d pr/xxxx ...\> REM Pull in the latest changes from main. ...\> git checkout main ...\> git pull upstream m ... eam. ...\> git push --dry-run upstream main ...\> REM Push! ...\> git push upstream main ...\> REM Delete the pull request branch. ...\> git branch -d pr/xxxx main にリベースした後、マージして upstream にプッシュする前に、そのブランチへ強制プッシュしま ... 照しているチケットの番号です。これで自動的に適切なチケットにコメントが投稿されます。 Backports ¶ Bug fix backports to stable branches are done exclusively by mergers, following the サポートバージョン . A backport consists of cherry-picking a commit from ... ... l be pushed to upstream. $ git push --dry-run upstream main $ # Push! $ git push upstream main $ # Delete the pull request branch. $ git branch -d pr/xxxx ...\> REM Pull in the latest changes from main. ...\> git checkout main ...\> git pull upstream m ... eam. ...\> git push --dry-run upstream main ...\> REM Push! ...\> git push upstream main ...\> REM Delete the pull request branch. ...\> git branch -d pr/xxxx main にリベースした後、マージして upstream にプッシュする前に、そのブランチへ強制プッシュしま ... 照しているチケットの番号です。これで自動的に適切なチケットにコメントが投稿されます。 Backports ¶ Bug fix backports to stable branches are done exclusively by mergers, following the サポートバージョン . A backport consists of cherry-picking a commit from ... ... s". Your username will be filled in the text box by default. See "Claiming" tickets for the full documentation. Creating a branch for the ticket ¶ How you create your branch depends on whether the ticket already has work attached to it. Starting fresh ... ¶ With the ticket claimed, create a branch for your work, replacing TicketNumber with the actual Trac ticket number: / $ git fetch upstream $ git checkout -b tic ... am/main ...\> git fetch upstream ...\> git checkout -b ticket_TicketNumber upstream/main When your work is ready, push the branch to your fork and open a pull request. See Submitting contributions for the full process. Continuing someone else's work ¶ ... 2026年10月08日