NO BUG - Clarify commit instructions for releasing geckodriver r=me
authorAndreas Tolfsen <ato@sny.no>
Tue, 31 Oct 2017 19:09:22 +0000
changeset 689756 9d884d70d5494fff4c4a544af8972a2a9b5a019a
parent 689755 f8eb20e6a5e56c04952a8517d96710938a9f35f0
child 689757 2639461973e707cff3b068ce3e25c9f79d9559f8
push id87097
push userdholbert@mozilla.com
push dateTue, 31 Oct 2017 22:39:07 +0000
reviewersme
milestone58.0a1
NO BUG - Clarify commit instructions for releasing geckodriver r=me DONTBUILD MozReview-Commit-ID: 6tsAfJ8WRDE
testing/geckodriver/doc/Releasing.md
--- a/testing/geckodriver/doc/Releasing.md
+++ b/testing/geckodriver/doc/Releasing.md
@@ -117,18 +117,16 @@ state of the project when it was exporte
 _release_, from where releases are made.  We will export the contents
 of [testing/geckodriver] to the latter branch:
 
 	% cd $SRC/geckodriver
 	% git checkout release
 	% git rm -rf .
 	% git clean -fxd
 	% cp -r $SRC/gecko/testing/geckodriver/* .
-	% git add .
-	% git commit -am "import of vX.Y.Z"
 
 [README]: ../README.md
 [testing/geckodriver]: ../
 
 
 Manually change `webdriver` dependency
 --------------------------------------
 
@@ -140,16 +138,29 @@ source code.
 
 This relative path does not exist in the GitHub repository and the
 build will fail unless we change it to the latest [webdriver] crate
 version from crates.io.  That version will either be the crate you
 published earlier, or the latest version available if no changes have
 been made to it since the last geckodriver release.
 
 
+Commit local changes
+--------------------
+
+Now commit all the changes you have made locally to the _release_ branch:
+
+	% git add .
+	% git commit -am "import of vX.Y.Z"
+
+As indicated above, the changes you make to this branch will not
+be upstreamed back into mozilla-central.  It is merely used as a
+staging ground for pushing builds to Travis.
+
+
 Tag the release
 ---------------
 
 Run the following command:
 
 	% git tag -a 'vX.Y.Z'
 
 Write the following in the annotation: