From b63dd7b0106a406953a25c0203629dc05f86e11c Mon Sep 17 00:00:00 2001
From: Mathieu Benoit <mathben@technolibre.ca>
Date: Mon, 6 Jul 2020 01:31:21 -0400
Subject: [PATCH] [ADD] DOC: Update RELEASE.md to do a release - Adapt repo
 manifest to release 1.0.0 - move prod manifest at root of project, default
 path of git-repo

---
 manifest/default.xml => default.xml |  0
 doc/GIT_REPO.md                     |  4 ++--
 doc/RELEASE.md                      | 11 +++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)
 rename manifest/default.xml => default.xml (100%)

diff --git a/manifest/default.xml b/default.xml
similarity index 100%
rename from manifest/default.xml
rename to default.xml
diff --git a/doc/GIT_REPO.md b/doc/GIT_REPO.md
index a2608c1..702c17c 100644
--- a/doc/GIT_REPO.md
+++ b/doc/GIT_REPO.md
@@ -10,7 +10,7 @@ curl https://storage.googleapis.com/git-repo-downloads/repo > ./venv/repo
 
 ## prod
 ```bash
-./venv/repo init -u http://git.erplibre.ca/ERPLibre -b 12.0_repo
+./venv/repo init -u http://git.erplibre.ca/ERPLibre -b master
 ./venv/repo sync
 ```
 
@@ -37,7 +37,7 @@ Freezes all repo, from dev to prod.
 
 This will add revision git hash in the Manifest.
 ```bash
-./venv/repo manifest -r -o ./manifest/default.xml
+./venv/repo manifest -r -o ./default.xml
 ```
 Do your commit.
 ```bash
diff --git a/doc/RELEASE.md b/doc/RELEASE.md
index 9e21f25..ec91d48 100644
--- a/doc/RELEASE.md
+++ b/doc/RELEASE.md
@@ -3,7 +3,7 @@ A guide on how to do a release.
 
 ## Generate new prod
 ```bash
-./venv/repo manifest -r -o ./manifest/default.xml
+./venv/repo manifest -r -o ./default.xml
 ```
 Do your commit.
 ```bash
@@ -11,7 +11,14 @@ git commit -am "[#ticket] subject: short sentence"
 ```
 
 ## Merge release
-Merge your feature to master. Generate a new tag. Fill CHANGELOG.md
+When ready to make a release, create a branch release/#.#.# and create a pull request to master.
+Update file CHANGELOG.md and create a section with new version.
+Merge it when maintener accept it.
+
+Add a tag on the commit on branch master with your release.
+> git tag v#.#.#
+Push your tag
+> git push --tags
 
 # TIPS
 ## Compare diff repo with another ERPLibre project