From: David Lamparter Date: Wed, 6 Oct 2021 16:12:26 +0000 (+0200) Subject: doc/developer: document dev tag on master X-Git-Tag: base_8.2~333^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=16044e7ff7bc06bd85aa8527f2512eff3abec4f9;p=mirror%2Ffrr.git doc/developer: document dev tag on master We have `frr-X.Y-dev` tags on master after pulling stable branches, otherwise the `gitversion` tooling / `--with-pkg-git-version` gets _very_ confused (it'll print something like: ``` FRRouting 8.2-dev-g210a75e65dad (areia). Copyright 1996-2005 Kunihiro Ishiguro, et al. This is a git build of frr-8.1-rc1-8-g210a75e65dad ``` (Note the conflicting version numbers.) Signed-off-by: David Lamparter --- diff --git a/doc/developer/workflow.rst b/doc/developer/workflow.rst index 2ce5f5d1c8..7cec5020b2 100644 --- a/doc/developer/workflow.rst +++ b/doc/developer/workflow.rst @@ -98,6 +98,16 @@ March/July/November. Walking backwards from this date: ``dev/MAJOR.MINOR`` at this point) and a ``rc1`` release candidate is tagged. Master is unfrozen and new features may again proceed. + Part of unfreezing master is editing the ``AC_INIT`` statement in + :file:`configure.ac` to reflect the new development version that master + now refers to. This is accompanied by a ``frr-X.Y-dev`` tag on master, + which should always be on the first commit on master *after* the stable + branch was forked (even if that is not the edit to ``AC_INIT``; it's more + important to have it on the very first commit on master after the fork.) + + (The :file:`configure.ac` edit and tag push are considered git housekeeping + and are pushed directly to ``master``, not through a PR.) + - 2 weeks earlier, a ``rc2`` release candidate is tagged. - on release date, the branch is renamed to ``stable/MAJOR.MINOR``.