We have discussed that when in Common team. The current solution worked
perfectly.
One person will merge the develop into feature/GEODE-7665 (which conceptually
can be anyone. I did 2 times) every week. Now Naba is taking the responsibility
to do the weekly merge. He did great!
Fork will cause many other issues, it will still need a person to maintain it.
I feel fork is only suitable for a work that will be finished within a week.
Regards
Gester
On 6/2/20, 4:41 PM, "Nabarun Nag" <n...@vmware.com> wrote:
I don’t think it is right to make the open source Geode Community to work
on my personal fork
Regards
Naba
-----Original Message-----
From: Mark Hanson <hans...@vmware.com>
Sent: Tuesday, June 2, 2020 4:35 PM
To: dev@geode.apache.org
Subject: Re: [DISCUSSION] Stop using the Geode Repository for Feature/WIP
Branches
While I am not 100% sure, I understand your thoughts here, I am pretty sure
I do. We have already done such work in a branch in a fork (Micrometer work).
The only real gotcha was that there needed to be one person at least as a
collaborator, in case of vacations and such.
All of the things you have specified are possible within the confines of a
fork.
Thanks,
Mark
On 6/2/20, 4:29 PM, "Nabarun Nag" <n...@vmware.com> wrote:
- We are maintaining feature/GEODE-7665 which is the feature branch for
PR clear work on which multiple developers are working on.
- We are maintaining this in Geode repository.
- All sub-tasks of GEODE-7665 are merged into this feature branch.
- Anyone in the Geode community can work on any subtask
- This is a long running, and a massive feature development which is
manipulating core code on Apache Geode. Hence all work is pushed to the feature
branch to keep develop isolated from a regression introduced in PR clear work.
- We have previously used release flags for Lucene work which we found
to be inefficient and unnecessary extra work.
We vote that PR clear feature branch be maintained in the Geode
Repository as this is a long running, massive effort involving everyone from
the community.
When the PR clear tasks are completed, the branch will be rigorously
tested and then squash merged into develop and the feature branch will be
deleted.
Regards
Naba
-----Original Message-----
From: Jacob Barrett <jbarr...@pivotal.io>
Sent: Tuesday, June 2, 2020 3:43 PM
To: dev@geode.apache.org
Subject: [DISCUSSION] Stop using the Geode Repository for Feature/WIP
Branches
I know this has been brought up multiple times without resolution. I
want us resolve to ban the use of Geode repository for work in progress,
feature branches, or any other branches that are not release or support
branches. There is no reason given the nature of GitHub why you can’t fork the
repository to contribute.
* Work done on these branches results in the ASF bots updating the
associated JIRAs and email blasting all of us with your work.
* People don’t clean up these branches, which leads to a mess of
branches on everyones clones and in the UI.
* All your intermediate commits get synced to the repo, which bloats
the repo for everyone else. Even your commits you rebase over and force push
are left in the repo. When you delete your branch these commits are not
removed. There is no way for us to prune unreferenced commits. Nobody else
needs your commits outside of what was merged to a production branch.
If anyone has a use case for working directly from Geode repo that
can’t work from a fork please post it here so we can resolve.
Thanks,
Jake
