diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2022-02-08 21:03:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-08 21:03:19 +0200 |
| commit | 8889ec2f022bcdb7e5a59a24ceb607065ebb6858 (patch) | |
| tree | 7a03652e3bc04fd1c3c46e78b6c9eede5fdf1b5d /doc/developer/workflow.rst | |
| parent | 341aecb2a112a95dde1a564fb0a1609276d7a425 (diff) | |
| parent | c1242b7be5dd358b6397777dacf2b98aadc5a371 (diff) | |
Merge pull request #10529 from Jafaral/doc-fix-order
doc: the dev tag should come after the new version commit step
Diffstat (limited to 'doc/developer/workflow.rst')
| -rw-r--r-- | doc/developer/workflow.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/developer/workflow.rst b/doc/developer/workflow.rst index 5911fdb587..6ae3d2939c 100644 --- a/doc/developer/workflow.rst +++ b/doc/developer/workflow.rst @@ -124,11 +124,11 @@ March/July/November. Walking backwards from this date: % git push upstream dev/8.2 % git checkout master % sed -i 's/8.2-dev/8.3-dev/' configure.ac - % git tag -a frr-8.3-dev -m "frr-8.3-dev" - % git push upstream frr-8.3-dev % git add configure.ac % git commit -s -m "build: FRR 8.3 development version" + % git tag -a frr-8.3-dev -m "frr-8.3-dev" % git push upstream master + % git push upstream frr-8.3-dev In this step, we also have to update package versions to reflect the development version. Versions need to be updated using |