Re: Development process

Quoting Alec Leamas (2012-06-24 14:39:09) > Now, there's the release, master, development and 'my' fixes branch. How > do we cooperate on these? > > One question is the check-in policy. Out of the top of my head it seems > reasonable that those who can commit commits "easy" patches directly to > devel, seeking advice and review when required. And that *someone" e. > g., sochotni is the sole master of release and master branch and the > only one committing to these. Basically my thoughts exactly > Other schemas are certainly possible, including some kind mandatory > review. But we need some kind of agreement on this... I wouldn't go that far... So here's my idea how we can work (preliminary). Master branch: * Mostly off-limits now. It should basically contain only merge commits from release-X branches and hotfix-X branches. No direct commits should happen in master branch now. That said, I'd like at least one other person to be "releng" with me because I feel lonely :-) Devel branch: * Mostly free-for-all. I would just ask for common sense. If you are fixing some bug, where you are confident it won't cause other issues...commit away. If you are adding a bigger new feature, create your own branch (I'd prefer a descriptive name about the feature). If you are not sure about the approach/code...ask for code review. Hotfix/Feature branches: * Free for all. For feature branches I'd even go as far as saying they can be rebased without any notice (though this probably won't be allowed by fedorahosted unless we ask for it). I'll document this in CONTRIBUTE file in a while so newcomers will know what to do.

Sounds reasonable?