<div dir="ltr"><div style>I would suggest a slightly different route...</div><div style><br></div><div style>Try and cherry pick 1.5 changes into master.</div><div><br></div><div style>Create a 1.6 branch to avoid any confusion and tag it as 1.6.0.</div>
<div style><br></div><div style>Tags become releases. We don't bother with preview/beta releases any more. just bump the minor on fixes.</div><div style>Branch is only used to back-port bug fixes from master.</div><div style>
<br></div><div style>--</div><div style><br></div><div style>M</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Apr 23, 2013 at 11:46 AM, Fred Barnes <span dir="ltr"><<a href="mailto:F.R.M.Barnes@kent.ac.uk" target="_blank">F.R.M.Barnes@kent.ac.uk</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
Hi all,<br>
<br>
I sat down the other evening with the intention of pulling things from kroc's<br>
'master' (unstable) branch into the 'kroc-1.5' (stable) branch. However,<br>
there's a *lot* and it's not clear to me whether it's all sensible (the earliest<br>
change looks like 2005/2008 which seems a bit old!). There are probably things<br>
committed in kroc-1.5 that aren't in master, but the log this way isn't clear.<br>
The way svn and Git merge branches seems to be different, so crudely pulling<br>
in changes from one to the other is, I suspect, likely to result in a horrid mess.<br>
<br>
As the 'master' branch is pretty stable (as far as I know), any objections if<br>
we rename the kroc-1.5 branch (to something like kroc-1.5-stable-old) and<br>
re-branch 'master' to 'kroc-1.5'? [once that's in place, we can cherry-pick<br>
(or similar) changes that were made on kroc-1.5[-stable-old] that should be<br>
kept, if there are any].<br>
<br>
<br>
Cheers,<br>
<br>
-- Fred<br>
<br>_______________________________________________<br>
developers mailing list<br>
developers@concurrency.cc<br>
<a href="http://lists.concurrency.cc/mailman/listinfo/developers" target="_blank">http://lists.concurrency.cc/mailman/listinfo/developers</a><br>
<br></blockquote></div><br></div>