[
https://issues.apache.org/jira/browse/SOLR-8621?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15128712#comment-15128712
]
Shai Erera commented on SOLR-8621:
----------------------------------
[~cpoerschke] I've one question about the branch you created. It seemed that
when you updated it to latest master, you did that with a _git merge_ command -
correct? So if now I type 'git log' I see something like this:
{noformat}
solr-8621 commit
solr-8621 commit
non-solr-8621 commit
non-solr-8621 commit
non-solr-8621 commit
non-solr-8621 commit
non-solr-8621 commit
non-solr-8621 commit
non-solr-8621 commit
solr-8621 commit
solr-8621 commit
{noformat}
I know we're still discussing rebase vs merge on that thread, and I don't mean
to continue the discussion here. I just want to level set with your
expectations and understand if you did that intentionally, i.e. is that how you
expect 'git log' to look eventually, or was that done as an afterthought?
I would personally rebase all commits we do in this branch on master, so that
eventually we can have the commits stacked on top of the latest one in master.
I would even squash all of them into a single commit which says "SOLR-8621: add
MergePolicyFactory" and with a broader description.
So again, just mean to level set with your intentions here :).
> solrconfig.xml: deprecate/replace <mergePolicy> with <mergePolicyFactory>
> -------------------------------------------------------------------------
>
> Key: SOLR-8621
> URL: https://issues.apache.org/jira/browse/SOLR-8621
> Project: Solr
> Issue Type: Task
> Reporter: Christine Poerschke
> Assignee: Christine Poerschke
>
> *<mergePolicyFactory> end-user benefits:*
> * Lucene's UpgradeIndexMergePolicy can be configured in Solr
> * (with SOLR-5730) Lucene's SortingMergePolicy can be configured in Solr
> * customisability: arbitrary merge policies including wrapping/nested merge
> policies can be created and configured
> *(proposed) roadmap:*
> * solr 5.5 introduces <mergePolicyFactory> support
> * solr 5.5(\?) deprecates (but maintains) <mergePolicy> support
> * solr 6.0(\?) removes <mergePolicy> support
> +work-in-progress git branch:+
> [master-solr-8621|https://github.com/apache/lucene-solr/tree/master-solr-8621]
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org
For additional commands, e-mail: dev-h...@lucene.apache.org
