From: Simon McVittie Date: Mon, 23 Jan 2012 12:01:56 +0000 (+0000) Subject: talk about stable branches a bit more X-Git-Tag: dbus-1.5.10~73 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a9149a3342c1711c3e6b1c566f1e50cbccabaa2;p=thirdparty%2Fdbus.git talk about stable branches a bit more --- diff --git a/HACKING b/HACKING index e776fd6d8..805fd2e00 100644 --- a/HACKING +++ b/HACKING @@ -208,16 +208,19 @@ To make a release of D-Bus, do the following: - post to dbus@lists.freedesktop.org announcing the release. -After making a ".0" stable release +Making a ".0" stable release === -We create a branch for each stable release; sometimes the branch is -not done immediately, instead it's possible to wait until someone has -a not-suitable-for-stable change they want to make and then branch to -allow committing that change. +We create a branch for each stable release. The branch name should be +dbus-X.Y which is a branch that has releases versioned X.Y.Z; +changes on a stable branch should be limited to significant bug fixes. -The branch name should be dbus-X.Y which is a branch that has -releases versioned X.Y.Z +Because we won't make minor changes like keeping up with the latest +deprecations on a stable branch, stable branches should turn off the +gcc warning for deprecated declarations (e.g. see commit 4ebb275ab7). + +Be extra-careful not to merge master (or any branch based on master) into a +stable branch. To branch: git branch dbus-X.Y