<html>
  <head>
    <meta content="text/html; charset=ISO-8859-1"
      http-equiv="Content-Type">
  </head>
  <body bgcolor="#FFFFFF" text="#000000">
    <div class="moz-cite-prefix">+1<br>
      On 03/22/2013 08:32 AM, Kris Borchers wrote:<br>
    </div>
    <blockquote
      cite="mid:1ED548DF-AAF0-4F2B-BDA2-20C58EF69E73@redhat.com"
      type="cite">
      <meta http-equiv="Content-Type" content="text/html;
        charset=ISO-8859-1">
      I definitely think branches are necessary. Just from my experience
      with jQuery, this has worked well.
      <div><br>
      </div>
      <div>When a new stable, minor version is released, a branch is
        created for it. So we would create a 1.0-stable branch or
        something like that. When bugs are fixed, they are fixed in
        master, then cherry-picked over to the current stable branch.
        When we are ready for a patch release (1.0.1 for example), that
        can be tagged directly from the 1.0-stable branch and all of
        those bug fixes already exist in master.</div>
      <div><br>
      </div>
      <div>In the meantime, new features (Notifier for example) are
        developed in a feature branch (currently we are doing that in
        the Notifier branch). Those branches occasionally have master
        merged into them to keep them up to date. Then, when we are
        ready to add a feature to the next release, the feature branch
        is merged into master. Then, based on our versioning policy, we
        create a new minor or major release by first creating a new
        stable branch (1.1-stable or 2.0-stable depending on what we're
        releasing), tag the release from that new branch, then delete
        the old stable branch.</div>
      <div><br>
      </div>
      <div>I really like this method because it allows for simultaneous
        new development and maintenance and easily keeps all branches
        and releases up to date with latest bug fixes.</div>
      <div><br>
      </div>
      <div>Thoughts?</div>
      <div><br>
        <div>
          <div>On Mar 22, 2013, at 7:22 AM, Daniel Passos &lt;<a
              moz-do-not-send="true" href="mailto:daniel@passos.me">daniel@passos.me</a>&gt;
            wrote:</div>
          <br class="Apple-interchange-newline">
          <blockquote type="cite">IMO tags work fine.
            <div><br>
            </div>
            <div>
              <div>I don't think a branch is necessary. If we have
                something to fix, we create a temporary branch, fix,
                merge to master and create a tag for it</div>
              <div><br>
              </div>
              <div>Daniel Passos</div>
              <br>
              <div class="gmail_quote">
                On Fri, Mar 22, 2013 at 7:03 AM, Bruno Oliveira <span
                  dir="ltr">&lt;<a moz-do-not-send="true"
                    href="mailto:bruno@abstractj.org" target="_blank">bruno@abstractj.org</a>&gt;</span>
                wrote:<br>
                <blockquote class="gmail_quote" style="margin:0 0 0
                  .8ex;border-left:1px #ccc solid;padding-left:1ex">
                  Hi Dan, I believe that we will stick with the
                  following approach <a moz-do-not-send="true"
href="http://aerogear-dev.1069024.n5.nabble.com/aerogear-dev-RFC-Initial-Versioning-Policy-td1914.html"
                    target="_blank">http://aerogear-dev.1069024.n5.nabble.com/aerogear-dev-RFC-Initial-Versioning-Policy-td1914.html</a><br>
                  <div class="im"><br>
                    <br>
                    <br>
                    --<br>
                    "The measure of a man is what he does with power" -
                    Plato<br>
                    -<br>
                    @abstractj<br>
                    -<br>
                    Volenti Nihil Difficile<br>
                    <br>
                    <br>
                    <br>
                  </div>
                  <div class="im">On Friday, March 22, 2013 at 6:57 AM,
                    Daniel Bevenius wrote:<br>
                    <br>
                    &gt; &gt; I'm not sure if we really need branches,
                    maybe just tags?<br>
                    &gt;<br>
                    &gt; Not sure how that would work but I'd be
                    interested to learn. I could not determine just by
                    looking at the torguebox repo as then have branches
                    for what looks like maintenance/dev releases (and
                    also tags of course)<br>
                    &gt; As long as we all do the same I'm happy.<br>
                    &gt;<br>
                    &gt;<br>
                    &gt;<br>
                  </div>
                  <div class="im">&gt; On 22 March 2013 10:23, Bruno
                    Oliveira &lt;<a moz-do-not-send="true"
                      href="mailto:bruno@abstractj.org">bruno@abstractj.org</a>
                    (mailto:<a moz-do-not-send="true"
                      href="mailto:bruno@abstractj.org">bruno@abstractj.org</a>)&gt;
                    wrote:<br>
                    &gt; &gt; I'm not sure if we really need branches,
                    maybe just tags? <a moz-do-not-send="true"
                      href="https://github.com/torquebox/torquebox"
                      target="_blank">https://github.com/torquebox/torquebox</a>
                    for example has been working with tags, branches at
                    least to me might lead to confusion.<br>
                    &gt; &gt;<br>
                    &gt; &gt;<br>
                    &gt; &gt; --<br>
                    &gt; &gt; "The measure of a man is what he does with
                    power" - Plato<br>
                    &gt; &gt; -<br>
                    &gt; &gt; @abstractj<br>
                    &gt; &gt; -<br>
                    &gt; &gt; Volenti Nihil Difficile<br>
                    &gt; &gt;<br>
                    &gt; &gt;<br>
                    &gt; &gt;<br>
                    &gt; &gt; On Friday, March 22, 2013 at 6:18 AM,
                    Sebastien Blanc wrote:<br>
                    &gt; &gt;<br>
                    &gt; &gt; &gt; +1 to create a 1.0.0 branch<br>
                    &gt; &gt; &gt; For 1.0.1 not sure if it has to be
                    also branch or just the master otherwise Master
                    should be for 1.1 stuff ?<br>
                    &gt; &gt; &gt; Seb<br>
                    &gt; &gt; &gt;<br>
                    &gt; &gt; &gt;<br>
                    &gt; &gt; &gt;<br>
                  </div>
                  <div class="im">&gt; &gt; &gt; On Fri, Mar 22, 2013 at
                    10:12 AM, Daniel Bevenius &lt;<a
                      moz-do-not-send="true"
                      href="mailto:daniel.bevenius@gmail.com">daniel.bevenius@gmail.com</a>
                    (mailto:<a moz-do-not-send="true"
                      href="mailto:daniel.bevenius@gmail.com">daniel.bevenius@gmail.com</a>)
                    (mailto:<a moz-do-not-send="true"
                      href="mailto:daniel.bevenius@gmail.com">daniel.bevenius@gmail.com</a>)&gt;
                    wrote:<br>
                    &gt; &gt; &gt; &gt; Hi all,<br>
                    &gt; &gt; &gt; &gt;<br>
                    &gt; &gt; &gt; &gt; I'd like to discuss how to
                    handle maintenance branches. Sorry if this has
                    already been discussed, I think Kris posted
                    something about this but I was not able to find it.<br>
                    &gt; &gt; &gt; &gt;<br>
                    &gt; &gt; &gt; &gt; For example, now that we are
                    about to release 1.0.0 we will tag that release.
                    After that should we create a 1.0.1 branch for
                    patches/bugfixes and then continue with new features
                    in master?<br>
                    &gt; &gt; &gt; &gt;<br>
                    &gt; &gt; &gt; &gt; Since we are in a waiting state
                    at the moment, which could happen again, should we
                    perhaps create a branch named 1.0.0, which we can
                    use until the release and then tag it and remove
                    that branch. After that any issues would be fixed in
                    the 1.0.1 branch.<br>
                    &gt; &gt; &gt; &gt;<br>
                    &gt; &gt; &gt; &gt; Does this sound correct?<br>
                    &gt; &gt; &gt; &gt;<br>
                    &gt; &gt; &gt; &gt; Thanks,<br>
                    &gt; &gt; &gt; &gt;<br>
                    &gt; &gt; &gt; &gt; /Dan<br>
                    &gt; &gt; &gt; &gt;<br>
                    &gt; &gt; &gt; &gt;<br>
                    &gt; &gt; &gt; &gt;
                    _______________________________________________<br>
                    &gt; &gt; &gt; &gt; aerogear-dev mailing list<br>
                  </div>
                  &gt; &gt; &gt; &gt; <a moz-do-not-send="true"
                    href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a>
                  (mailto:<a moz-do-not-send="true"
                    href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a>)
                  (mailto:<a moz-do-not-send="true"
                    href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a>)<br>
                  <div class="im">&gt; &gt; &gt; &gt; <a
                      moz-do-not-send="true"
                      href="https://lists.jboss.org/mailman/listinfo/aerogear-dev"
                      target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
                    &gt; &gt; &gt;<br>
                    &gt; &gt; &gt;<br>
                    &gt; &gt; &gt;<br>
                    &gt; &gt; &gt;
                    _______________________________________________<br>
                    &gt; &gt; &gt; aerogear-dev mailing list<br>
                  </div>
                  &gt; &gt; &gt; <a moz-do-not-send="true"
                    href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a>
                  (mailto:<a moz-do-not-send="true"
                    href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a>)
                  (mailto:<a moz-do-not-send="true"
                    href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a>)<br>
                  <div class="HOEnZb">
                    <div class="h5">&gt; &gt; &gt; <a
                        moz-do-not-send="true"
                        href="https://lists.jboss.org/mailman/listinfo/aerogear-dev"
                        target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
                      &gt; &gt;<br>
                      &gt; &gt;<br>
                      &gt; &gt;<br>
                      &gt; &gt;<br>
                      &gt; &gt;
                      _______________________________________________<br>
                      &gt; &gt; aerogear-dev mailing list<br>
                      &gt; &gt; <a moz-do-not-send="true"
                        href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a>
                      (mailto:<a moz-do-not-send="true"
                        href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a>)<br>
                      &gt; &gt; <a moz-do-not-send="true"
                        href="https://lists.jboss.org/mailman/listinfo/aerogear-dev"
                        target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
                      &gt;<br>
                      &gt;<br>
                      &gt;
                      _______________________________________________<br>
                      &gt; aerogear-dev mailing list<br>
                      &gt; <a moz-do-not-send="true"
                        href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a>
                      (mailto:<a moz-do-not-send="true"
                        href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a>)<br>
                      &gt; <a moz-do-not-send="true"
                        href="https://lists.jboss.org/mailman/listinfo/aerogear-dev"
                        target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
                      <br>
                      <br>
                      <br>
                      _______________________________________________<br>
                      aerogear-dev mailing list<br>
                      <a moz-do-not-send="true"
                        href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a><br>
                      <a moz-do-not-send="true"
                        href="https://lists.jboss.org/mailman/listinfo/aerogear-dev"
                        target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
                    </div>
                  </div>
                </blockquote>
              </div>
              <br>
            </div>
            _______________________________________________<br>
            aerogear-dev mailing list<br>
            <a moz-do-not-send="true"
              href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a><br>
            <a class="moz-txt-link-freetext" href="https://lists.jboss.org/mailman/listinfo/aerogear-dev">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a></blockquote>
        </div>
        <br>
      </div>
      <br>
      <fieldset class="mimeAttachmentHeader"></fieldset>
      <br>
      <pre wrap="">_______________________________________________
aerogear-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a>
<a class="moz-txt-link-freetext" href="https://lists.jboss.org/mailman/listinfo/aerogear-dev">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a></pre>
    </blockquote>
    <br>
  </body>
</html>