|
 |
08bafd |
commit 76f7c710435d28c9dc8cad8540615ba73f3c00c4
|
|
|
08bafd |
Author: Alexander Scheel <alexander.m.scheel@gmail.com>
|
|
|
08bafd |
Date: Thu May 31 08:17:15 2018 -0400
|
|
|
08bafd |
|
|
|
08bafd |
Updated README instructions for git
|
|
|
08bafd |
|
|
|
08bafd |
Signed-off-by: Alexander Scheel <alexander.m.scheel@gmail.com>
|
|
|
08bafd |
|
|
|
08bafd |
diff --git a/README b/README
|
|
|
08bafd |
index 5a1bc49c..9f1929ac 100644
|
|
|
08bafd |
--- a/jss/README
|
|
|
08bafd |
+++ b/jss/README
|
|
|
08bafd |
@@ -17,7 +17,7 @@
|
|
|
08bafd |
(There is no need to clone every time. For additional builds,
|
|
|
08bafd |
simply use:
|
|
|
08bafd |
cd nspr; hg pull -u -v; cd ..; cd nss; hg pull -u -v; cd ..;
|
|
|
08bafd |
- cd jss; hg pull -u -v; cd ..
|
|
|
08bafd |
+ cd jss; git pull -u -v; cd ..
|
|
|
08bafd |
)
|
|
|
08bafd |
|
|
|
08bafd |
(b) Alternatively, for upstream builds which use
|
|
|
08bafd |
@@ -39,7 +39,7 @@
|
|
|
08bafd |
|
|
|
08bafd |
(There is no need to clone every time. For additional builds,
|
|
|
08bafd |
simply use:
|
|
|
08bafd |
- cd jss; hg pull -u -v; cd ..
|
|
|
08bafd |
+ cd jss; git pull -u -v; cd ..
|
|
|
08bafd |
)
|
|
|
08bafd |
|
|
|
08bafd |
|
|
|
08bafd |
@@ -164,7 +164,7 @@
|
|
|
08bafd |
good practice to create a "regular tag" to the source code at these
|
|
|
08bafd |
various points in time using the following format:
|
|
|
08bafd |
|
|
|
08bafd |
- # hg tag -m "message" JSS_<major>_<minor>_YYYYMMDD
|
|
|
08bafd |
+ # git tag -m "message" JSS_<major>_<minor>_YYYYMMDD
|
|
|
08bafd |
|
|
|
08bafd |
where: <major> = JSS Major Version Number
|
|
|
08bafd |
<minor> = JSS Minor Version Number
|
|
|
08bafd |
@@ -174,10 +174,10 @@
|
|
|
08bafd |
|
|
|
08bafd |
For example:
|
|
|
08bafd |
|
|
|
08bafd |
- # hg id
|
|
|
08bafd |
- b3e864205ff0+ tip
|
|
|
08bafd |
+ # git rev-parse HEAD
|
|
|
08bafd |
+ b3e864205ff0...
|
|
|
08bafd |
|
|
|
08bafd |
- # hg tag -m "Added tag JSS_4_4_20170328 for changeset b3e864205ff0" JSS_4_4_20170328
|
|
|
08bafd |
+ # git tag -m "Added tag JSS_4_4_20170328 for changeset b3e864205ff0" JSS_4_4_20170328
|
|
|
08bafd |
|
|
|
08bafd |
At the appropriate time, a new major.minor version may be created. At this
|
|
|
08bafd |
time, it is important to create a maintenance branch for any future changes
|
|
|
08bafd |
@@ -185,10 +185,10 @@
|
|
|
08bafd |
|
|
|
08bafd |
For example:
|
|
|
08bafd |
|
|
|
08bafd |
- # hg id
|
|
|
08bafd |
- f00f00f00f00+ tip
|
|
|
08bafd |
+ # git rev-parse HEAD
|
|
|
08bafd |
+ f00f00f00f00...
|
|
|
08bafd |
|
|
|
08bafd |
- # hg branch -m "Created branch JSS_4_4_BRANCH for changeset f00f00f00f00" JSS_4_4_BRANCH
|
|
|
08bafd |
+ # git checkout -b JSS_4_4_BRANCH
|
|
|
08bafd |
|
|
|
08bafd |
|
|
|
08bafd |
(8) Known Issues
|