<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
Hi,<br>
<br>
I am in the process of modifying the build scripts to use github in
stead of svn.<br>
<br>
And I noticed that Nicodem committed to master yesterday, so I've
got a question given the workflow mentioned below:<br>
<br>
1. Will we do hotfixes on released branches, i.e. on master and 2.0?<br>
2. What shall we put up on the community website? What is the
equivalent to the svn trunk. master or develop, i.e. what is the
basis for 'unstable'?<br>
<br>
Regards,<br>
<br>
Tom<br>
<br>
<div class="moz-cite-prefix">Op 5-9-2013 15:39, Julian Tenney
schreef:<br>
</div>
<blockquote
cite="mid:12C67A1EEC419342AF5E59DA31562C3F0C80D193A9@EXCHANGE1.ad.nottingham.ac.uk"
type="cite">
<meta http-equiv="Content-Type" content="text/html;
charset=ISO-8859-1">
<meta name="Generator" content="Microsoft Word 14 (filtered
medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Wingdings;
panose-1:5 0 0 0 0 0 0 0 0 0;}
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:"\@SimSun";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
{mso-style-priority:34;
margin-top:0cm;
margin-right:0cm;
margin-bottom:0cm;
margin-left:36.0pt;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
/* List Definitions */
@list l0
{mso-list-id:1915238708;
mso-list-type:hybrid;
mso-list-template-ids:-851004264 1333271540 134807555 134807557 134807553 134807555 134807557 134807553 134807555 134807557;}
@list l0:level1
{mso-level-start-at:0;
mso-level-number-format:bullet;
mso-level-text:-;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:"Calibri","sans-serif";
mso-fareast-font-family:SimSun;
mso-bidi-font-family:Arial;}
@list l0:level2
{mso-level-number-format:bullet;
mso-level-text:o;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:"Courier New";}
@list l0:level3
{mso-level-number-format:bullet;
mso-level-text:\F0A7;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:Wingdings;}
@list l0:level4
{mso-level-number-format:bullet;
mso-level-text:\F0B7;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:Symbol;}
@list l0:level5
{mso-level-number-format:bullet;
mso-level-text:o;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:"Courier New";}
@list l0:level6
{mso-level-number-format:bullet;
mso-level-text:\F0A7;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:Wingdings;}
@list l0:level7
{mso-level-number-format:bullet;
mso-level-text:\F0B7;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:Symbol;}
@list l0:level8
{mso-level-number-format:bullet;
mso-level-text:o;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:"Courier New";}
@list l0:level9
{mso-level-number-format:bullet;
mso-level-text:\F0A7;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:Wingdings;}
ol
{margin-bottom:0cm;}
ul
{margin-bottom:0cm;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
<div class="WordSection1">
<p class="MsoNormal">Hi,<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">I think we’ve got the SVN migrated over to
Git Hub with all the history, branches etc, which is great. We
need to have some discussion about workflow, and I want to
suggest gitflow as a good workflow to adopt. Information can
be found here <a moz-do-not-send="true"
href="http://nvie.com/posts/a-successful-git-branching-model/">http://nvie.com/posts/a-successful-git-branching-model/</a>
and elsewhere (here: <a moz-do-not-send="true"
href="https://www.atlassian.com/git/workflows">https://www.atlassian.com/git/workflows</a>
for example).<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">I like it for several reasons:<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoListParagraph"
style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><!--[if !supportLists]--><span
style="mso-list:Ignore">-<span style="font:7.0pt "Times
New Roman""> </span></span><!--[endif]--><span
dir="LTR"></span>The ‘master’ branch is always production
quality released code<o:p></o:p></p>
<p class="MsoListParagraph"
style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><!--[if !supportLists]--><span
style="mso-list:Ignore">-<span style="font:7.0pt "Times
New Roman""> </span></span><!--[endif]--><span
dir="LTR"></span>Small developments (trivial) can be
undertaken directly in ‘develop’<o:p></o:p></p>
<p class="MsoListParagraph"
style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><!--[if !supportLists]--><span
style="mso-list:Ignore">-<span style="font:7.0pt "Times
New Roman""> </span></span><!--[endif]--><span
dir="LTR"></span>Larger developments can be undertaken in
braches taken from ‘develop’, and then merged back into
develop once complete…<o:p></o:p></p>
<p class="MsoListParagraph"
style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><!--[if !supportLists]--><span
style="mso-list:Ignore">-<span style="font:7.0pt "Times
New Roman""> </span></span><!--[endif]--><span
dir="LTR"></span>…testing of develop can then be undertaken
before we make a new release number.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">See the information for more details. Does
this seem sensible and agreeable to everyone?<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">There are two other things I’d like us to
work towards, again subject to some discussion between us:<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Using Tickets for Issues and New Features:<o:p></o:p></p>
<p class="MsoListParagraph"
style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><!--[if !supportLists]--><span
style="mso-list:Ignore">-<span style="font:7.0pt "Times
New Roman""> </span></span><!--[endif]--><span
dir="LTR"></span>Using some ticketing system to record bugs
to be fixed, new features to be developed, because we keep
losing these;<o:p></o:p></p>
<p class="MsoListParagraph"
style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><!--[if !supportLists]--><span
style="mso-list:Ignore">-<span style="font:7.0pt "Times
New Roman""> </span></span><!--[endif]--><span
dir="LTR"></span>Using those tickets as a way of grouping
work into sprints towards a new release;<o:p></o:p></p>
<p class="MsoListParagraph"
style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><!--[if !supportLists]--><span
style="mso-list:Ignore">-<span style="font:7.0pt "Times
New Roman""> </span></span><!--[endif]--><span
dir="LTR"></span>Could be trac, could be github, open to
suggestions;<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">A better means of testing the software
rather than the hit and hope method we currently employ:<o:p></o:p></p>
<p class="MsoListParagraph"
style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><!--[if !supportLists]--><span
style="mso-list:Ignore">-<span style="font:7.0pt "Times
New Roman""> </span></span><!--[endif]--><span
dir="LTR"></span>Open to suggestions here?<o:p></o:p></p>
<p class="MsoListParagraph"
style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><!--[if !supportLists]--><span
style="mso-list:Ignore">-<span style="font:7.0pt "Times
New Roman""> </span></span><!--[endif]--><span
dir="LTR"></span>Probably starts with a list of manual tests
to work through?<o:p></o:p></p>
<p class="MsoListParagraph"
style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><!--[if !supportLists]--><span
style="mso-list:Ignore">-<span style="font:7.0pt "Times
New Roman""> </span></span><!--[endif]--><span
dir="LTR"></span>Possibly includes automation (Selenium?)<o:p></o:p></p>
<p class="MsoListParagraph"
style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><!--[if !supportLists]--><span
style="mso-list:Ignore">-<span style="font:7.0pt "Times
New Roman""> </span></span><!--[endif]--><span
dir="LTR"></span>UnitTesting probably a very long term goal,
might not even be possible?<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">So my vision would be that we log tickets,
we use that list of tickets as a big to-do list; we create a
smaller current to-do list from it for the next release; we do
the development a la gitflow; changes get pushed to develop
and tested; new version released. It sounds good in theory at
any rate, it will require a bit more discipline amongst us,
but I think the benefits are worth it. I’d very much
appreciate your views…<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Thanks,<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Julian<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<br>
<p>This message and any attachment are intended solely for the
addressee and may contain confidential information. If you have
received this message in error, please send it back to me, and
immediately delete it. Please do not use, copy or disclose the
information contained in this message or in any attachment. Any
views or opinions expressed by the author of this email do not
necessarily reflect the views of the University of Nottingham.</p>
<p>This message has been checked for viruses but the contents of
an attachment may still contain software viruses which could
damage your computer system, you are advised to perform your own
checks. Email communications with the University of Nottingham
may be monitored as permitted by UK legislation.</p>
<br>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
Xerte-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a>
<a class="moz-txt-link-freetext" href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a>
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
--
Tom Reijnders
TOR Informatica
Chopinlaan 27
5242HM Rosmalen
Tel: 073 5226191
Fax: 073 5226196
</pre>
</body>
</html>