+1 (binding)
as this gets rolled out, I think we may also want define a branch naming
policy like feature/${JIRA}-text for features, as well as a policy for
deleting retired branches (tag the last commit then rm the branch)...then
we can cull some branches that are in SVN.
-steve
On 9 August 2014 03:57, Karthik Kambatla <ka...@cloudera.com> wrote:
> I have put together this proposal based on recent discussion on this topic.
>
> Please vote on the proposal. The vote runs for 7 days.
>
> 1. Migrate from subversion to git for version control.
> 2. Force-push to be disabled on trunk and branch-* branches. Applying
> changes from any of trunk/branch-* to any of branch-* should be through
> "git cherry-pick -x".
> 3. Force-push on feature-branches is allowed. Before pulling in a
> feature, the feature-branch should be rebased on latest trunk and the
> changes applied to trunk through "git rebase --onto" or "git cherry-pick
> <commit-range>".
> 4. Every time a feature branch is rebased on trunk, a tag that
> identifies the state before the rebase needs to be created (e.g.
> tag_feature_JIRA-2454_2014-08-07_rebase). These tags can be deleted once
> the feature is pulled into trunk and the tags are no longer useful.
> 5. The relevance/use of tags stay the same after the migration.
>
> Thanks
> Karthik
>
> PS: Per Andrew Wang, this should be a "Adoption of New Codebase" kind of
> vote and will be Lazy 2/3 majority of PMC members.
>
--
CONFIDENTIALITY NOTICE
NOTICE: This message is intended for the use of the individual or entity to
which it is addressed and may contain information that is confidential,
privileged and exempt from disclosure under applicable law. If the reader
of this message is not the intended recipient, you are hereby notified that
any printing, copying, dissemination, distribution, disclosure or
forwarding of this communication is strictly prohibited. If you have
received this communication in error, please contact the sender immediately
and delete it from your system. Thank You.
