From 8d296d0e1da74be0319d95b671d0671d08b21380 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Mon, 2 Sep 2019 13:05:29 +0100
Subject: [PATCH] Start v1.49.1-DEV development

---
 RELEASE.md    | 60 +++++++++++++++++++++++++++++++++++----------------
 fs/version.go |  2 +-
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index 17c54f72c..4c6db9ed5 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,8 +1,14 @@
-Extra required software for making a release
+# Release
+
+This file describes how to make the various kinds of releases
+
+## Extra required software for making a release
+
   * [github-release](https://github.com/aktau/github-release) for uploading packages
   * pandoc for making the html and man pages
 
-Making a release
+## Making a release
+
   * git status - make sure everything is checked in
   * Check travis & appveyor builds are green
   * make check
@@ -26,6 +32,7 @@ Making a release
   * # announce with forum post, twitter post, G+ post
 
 Early in the next release cycle update the vendored dependencies
+
   * Review any pinned packages in go.mod and remove if possible
   * make update
   * git status
@@ -47,24 +54,39 @@ Can be fixed with
     * GO111MODULE=on go mod vendor
  
 
-Making a point release.  If rclone needs a point release due to some
-horrendous bug, then
-  * git branch v1.XX v1.XX-fixes
+## Making a point release
+
+If rclone needs a point release due to some horrendous bug then a
+point release is necessary.
+
+First make the release branch.  If this is a second point release then
+this will be done already.
+
+  * BASE_TAG=${BASE_TAG}  # eg v1.49
+  * NEW_TAG=${BASE_TAG}.Y # eg v1.49.1
+  * git branch ${BASE_TAG} ${BASE_TAG}-fixes
+
+Now
+
+  * git co ${BASE_TAG}-fixes
   * git cherry-pick any fixes
   * Test (see above)
-  * make NEW_TAG=v1.XX.1 tag
+  * make NEW_TAG=${NEW_TAG} tag
   * edit docs/content/changelog.md
-  * make TAG=v1.43.1 doc
-  * git commit -a -v -m "Version v1.XX.1"
-  * git tag -d -v1.XX.1
-  * git tag -s -m "Version v1.XX.1" v1.XX.1
-  * git push --tags -u origin v1.XX-fixes
-  * make BRANCH_PATH= TAG=v1.43.1 fetch_binaries
-  * make TAG=v1.43.1 tarball
-  * make TAG=v1.43.1 sign_upload
-  * make TAG=v1.43.1 check_sign
-  * make TAG=v1.43.1 upload
-  * make TAG=v1.43.1 upload_website
-  * make TAG=v1.43.1 upload_github
-  * NB this overwrites the current beta so after the release, rebuild the last travis build
+  * make TAG=${NEW_TAG} doc
+  * git commit -a -v -m "Version ${NEW_TAG}"
+  * git tag -d -${NEW_TAG}
+  * git tag -s -m "Version ${NEW_TAG}" ${NEW_TAG}
+  * git push --tags -u origin ${BASE_TAG}-fixes
+  * make BRANCH_PATH= TAG=${NEW_TAG} fetch_binaries
+  * make TAG=${NEW_TAG} tarball
+  * make TAG=${NEW_TAG} sign_upload
+  * make TAG=${NEW_TAG} check_sign
+  * make TAG=${NEW_TAG} upload
+  * make TAG=${NEW_TAG} upload_website
+  * make TAG=${NEW_TAG} upload_github
+  * NB this overwrites the current beta so we need to do this
+  * git co master
+  * make LAST_TAG=${NEW_TAG} startdev
+  * git push
   * Announce!
diff --git a/fs/version.go b/fs/version.go
index 450fe0517..522d1ed23 100644
--- a/fs/version.go
+++ b/fs/version.go
@@ -1,4 +1,4 @@
 package fs
 
 // Version of rclone
-var Version = "v1.49.0-DEV"
+var Version = "v1.49.1-DEV"