From 51edb8c741eafb9b3ef09366a306afaf7276ea39 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Tue, 11 Oct 2022 15:41:24 -0400
Subject: [PATCH] NewRelease: update to reflect latest release workflow

---
 docs/NewRelease.md.tmpl | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/docs/NewRelease.md.tmpl b/docs/NewRelease.md.tmpl
index f20d3dd3f..99c960502 100644
--- a/docs/NewRelease.md.tmpl
+++ b/docs/NewRelease.md.tmpl
@@ -46,12 +46,17 @@ $if(PATCH == 0 and RC == "-rc1")\
       taking master's version)
 ```
 git merge --no-ff origin/master
-echo "$(MAJOR).$(MINOR).9999" > version.txt
-git add version.txt
 ```
 $else\
 - [ ] Backport merge-requests belonging to the milestone $(VERSION)
 $endif\
+$if(PATCH == 0)\
+- [ ] Set version to master
+```
+echo "$(MAJOR).$(MINOR).9999" > version.txt
+git add version.txt
+```
+$endif\
 
 - [ ] Update the version (not in patch releases) and date in the LICENSE.md
       file `git add LICENSE.md`.
@@ -88,7 +93,7 @@ The major changes to VTK-m from (previous release) can be found in:
 - Integrate changes to `release` branch
   - [ ] Create a MR using the [release-mr script][1]
         (see [notes](#notes-about-update-mr)).
-$if(PATCH == 0 and RC == "-rc1")\
+$if(PATCH == 0)\
   - [ ] Add (or ensure) at the bottom of the description of the merge request:
         `Backport: master:HEAD~1`
 $else\
@@ -111,7 +116,7 @@ $if(PATCH == 0 and RC == "-rc1")\
 $endif\
 - [ ] Copy the contents of docs/changelog/$(VERSION)/release-notes.md to
       the GitLab release.
-$if(PATCH == 0 and RC == ""))\
+$if(PATCH == 0 and RC == "")\
 - [ ] Tag new version of the [VTK-m User Guide][2].
 $endif\
 - [ ] Post an [Email Announcements](#email-announcements) VTK-m mailing list.
@@ -269,9 +274,11 @@ $else\
 $endif\
 ```
 
-@ben.boeckel  
-@vbolea  
-/label ~"priority:required"  
-
 [1]:  https://gitlab.kitware.com/utils/release-utils/-/blob/master/release-mr.py
 [2]:  https://gitlab.kitware.com/vtk/vtk-m-user-guide
+
+@ben.boeckel  
+@vbolea  
+/label ~"area:release"  
+/milestone %"v$(VERSION)"  
+/assign @vbolea