On 08/14/2013 12:49 PM, Todd Tannenbaum wrote:
On 8/14/2013 8:04 AM, Matthew Farrellee wrote:
On 08/13/2013 04:39 PM, John (TJ) Knoeller wrote:
see
https://htcondor-wiki.cs.wisc.edu/index.cgi/wiki?p=SourceCodeBranches
for the new merge rules.
-tj
It's quite strange for a project to be frequently changing its merge
rules. Just keep it simple.
Nothing changed about the "process" here, just the actual version
numbers on the wiki page changed.
The rules for 98% of all commits is simple: bug fixes go onto the stable
branch (V8_0-branch), new capabilities onto master.
regards,
Todd
I recommend simplifying that wiki page, which has multiple bullet points
and strike text and "serious this" and "very very urgent that", to say
basically what you said above. You would only have to update it on every
new stable series (no update again until 8.2), and everyone could
understand what to do without first checking the wiki.
Best,
matt
|