On 11/09/2012 07:26, Marvin Humphrey wrote:
Infra requires a point person from any project which wants to use Git. It
seems that Python expertise is a plus, though the stuff I worked on was in
Perl.
Whoever wants to be that person should be the one to open up an INFRA Jira
issue (in which they should communicate that they're volunteering).
Although I don't have any Python experience, I can offer to create the
INFRA issue and act as point person. But we should probably call a vote
on this procedural issue first.
Other stuff which will need updating:
* release_commands.pl
* CONTRIBUTING
* buildbots
* website links
* [stuff I haven't thought of]
* Make sure commit messages get posted to lucy-commits
Lastly, we need a policy regarding merging to master. Here's our baseline:
https://git-wip-us.apache.org/docs/switching-to-git.html#protected-ref-lists
ASF wide policy prevents rewriting history on the main development branch
of every project.
I wonder a bit about the next sentence on that page:
"A common configuration is to prevent non-fast-forward updates on any
ref that matches the following patterns:"
Preventing non-fast-forward updates is what you describe below. But you
can also have merges aren't fast-forward, but don't rewrite history. It
probably only means that enforcing fast-forward updates is one way to
make sure that you never rewrite history.
What I would propose for the time being is to do all work in feature branches,
then rebase before merging the commits to the master branch so that we
preserve a linear commit history. That keeps an svn-like status quo for now
and allows everybody to come up to speed; we can have a sophisticated
discussion about merging strategy a little while down the road.
That's OK with me.
Nick
