Provided sprint plan, gave hints on Git branching and tagging.

diff --git a/src/site/apt/eval/s1.apt b/src/site/apt/eval/s1.apt
index a451417..df40740 100644 (file)
--- a/src/site/apt/eval/s1.apt
+++ b/src/site/apt/eval/s1.apt
@@ -79,7 +79,7 @@ branch. You will merge the deliverable from you development branch <sprint1>
 
 Evaluation
 
-       10 points at most are attributed to this deliverable.
+       5 points at most are attributed to this deliverable.
 
 *-------------------------------------------+---------------*-----------------*
 | Item                                                                         | Max. points   | Points received |
@@ -108,4 +108,7 @@ If you don't use APT, then PDF files will do as well.
 
 Deadline
 
-       This deliverable is due: TBD.
+       This deliverable is due: See {{{./sprints.html}Sprint Plan}}.
+
+       [Note:] Deadline is Friday evening. However, you can provide
+                       your deliverable till the following Sunday evening, 12 pm.

diff --git a/src/site/apt/eval/s2.apt b/src/site/apt/eval/s2.apt
index cfe5aee..b7233fe 100644 (file)
--- a/src/site/apt/eval/s2.apt
+++ b/src/site/apt/eval/s2.apt
@@ -3,7 +3,7 @@
                -------------
                Eric Dubuis
                -------------
-               November 12, 2014
+               October 11, 2015
 
 Deliverable 2
 
@@ -35,7 +35,7 @@ example, in the Iteration Plan document, however.)
 
 * Evaluation
 
-       10 points at most are attributed to this deliverable.
+       15 points at most are attributed to this deliverable.
 
        TBD.
 
@@ -43,7 +43,7 @@ example, in the Iteration Plan document, however.)
 
 * Deadline
 
-       This deliverable is due: TBD.
+       This deliverable is due: See {{{./sprints.html}Sprint Plan}}.
 
        [Note:] Deadline is Friday evening. However, you can provide
                        your deliverable till the following Sunday evening, 12 pm.

diff --git a/src/site/apt/eval/s3.apt b/src/site/apt/eval/s3.apt
index 7abe002..65d7c28 100644 (file)
--- a/src/site/apt/eval/s3.apt
+++ b/src/site/apt/eval/s3.apt
@@ -3,7 +3,7 @@
                -------------
                Eric Dubuis
                -------------
-               November 3, 2014
+               October 11, 2015
 
 
 Deliverable 3
@@ -47,4 +47,7 @@ example, in the Iteration Plan document, however.)
 
 * Deadline
 
-       This deliverable is due: TBD.
+       This deliverable is due: See {{{./sprints.html}Sprint Plan}}.
+
+       [Note:] Deadline is Friday evening. However, you can provide
+                       your deliverable till the following Sunday evening, 12 pm.

diff --git a/src/site/apt/eval/s4.apt b/src/site/apt/eval/s4.apt
index 782404e..9d59bae 100644 (file)
--- a/src/site/apt/eval/s4.apt
+++ b/src/site/apt/eval/s4.apt
@@ -56,7 +56,7 @@ following UML package diagram.
 
 * Deadline
 
-       This deliverable is due: TBD.
+       This deliverable is due: See {{{./sprints.html}Sprint Plan}}.
 
                [Note:] Deadline is Friday evening. However, you can provide
                        your deliverable till the following Sunday evening, 12 pm.

diff --git a/src/site/apt/eval/sprints.apt b/src/site/apt/eval/sprints.apt
index 0d48d51..83fa77b 100644 (file)
--- a/src/site/apt/eval/sprints.apt
+++ b/src/site/apt/eval/sprints.apt
@@ -24,19 +24,19 @@ can be handled (rather) easily.
 
        The following sprints and deliverables are planned:
 
-*-----------------------------------------------+---------------*-----------------*
-| Sprint/Deliverable                                                   | Due date              | Points                  |
-*-----------------------------------------------+---------------*-----------------*
-| Sprint 1/{{{./s1.html}Deliverable 1 (D1)}}   | Oct. 16, 2015 |                5                |
-*-----------------------------------------------+---------------*-----------------*
-| Sprint 2/{{{./s2.html}Deliverable 2 (D2)}}   | Nov. 6, 2015  |               15                |
-*-----------------------------------------------+---------------*-----------------*
-| Sprint 3/{{{./s3.html}Deliverable 3 (D3)}}   | Nov. 27, 2015 |               15                |
-*-----------------------------------------------+---------------*-----------------*
-| Sprint 4/{{{./s4.html}Deliverable 4 (D4)}}   | Dec. 18, 2015 |               15                |
-*-----------------------------------------------:---------------*-----------------*
+*-----------------------------------------------+---------------*-----------------*-----------------*
+| Sprint/Deliverable                                                   | Due date              | Points                  | Git tag                     |
+*-----------------------------------------------+---------------*-----------------*-----------------*
+| Sprint 1/{{{./s1.html}Deliverable 1 (D1)}}   | Oct. 16, 2015 |                5                | del1                        |
+*-----------------------------------------------+---------------*-----------------*-----------------*
+| Sprint 2/{{{./s2.html}Deliverable 2 (D2)}}   | Nov. 6, 2015  |               15                | del2                        |
+*-----------------------------------------------+---------------*-----------------*-----------------*
+| Sprint 3/{{{./s3.html}Deliverable 3 (D3)}}   | Nov. 27, 2015 |               15                | del3                        |
+*-----------------------------------------------+---------------*-----------------*-----------------*
+| Sprint 4/{{{./s4.html}Deliverable 4 (D4)}}   | Dec. 18, 2015 |               15                | del4                        |
+*-----------------------------------------------:---------------*-----------------*-----------------*
 |                                                                              Total   |                               |               50                |
-*-----------------------------------------------+---------------*-----------------*
+*-----------------------------------------------+---------------*-----------------*-----------------*
 Planning of sprints and deliverables.
 
 
@@ -44,3 +44,32 @@ Planning of sprints and deliverables.
                        your deliverables till the following Sunday evening, 12 pm.
 
 
+* Deliverables and Git Branches
+
+       Here I give a few rules how to work with Git branches:
+
+       * Performing the first sprint "Sprint 1", you work on the master. (If you
+               have already introduced branches, make sure the relevant stuff is
+               merged onto the master branch.)
+
+       * To produce the first deliverable "del1", tag the deliverable on the master
+               branch. The tagged version will be evaluated.
+
+       * From that tagged version, create the branch "development". This branch will
+               be used during the forthcoming sprints. The build server will be bound
+               to this branch.
+
+       * To produce the deliverable "k", k > 1, merge the content of branch
+               development to the master branch and tag it accordingly.
+
+       []
+
+       The branches of the Git repository may then look like:
+
+---
+development      +----+------+------+     development
+                /      \      \      \
+master     ----+--------+------+------+-  master
+               ^        ^      ^      ^
+tags          del1     del2   del3   del4
+---