[
https://issues.apache.org/jira/browse/LUCENE-1540?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12990854#comment-12990854
]
Doron Cohen edited comment on LUCENE-1540 at 2/5/11 12:55 AM:
--------------------------------------------------------------
Committed:
r1066771 - 3x
r1067359 - trunk,
A comment about the merging and the fixing of mergeinfo's.
The great [wiki page about
svn-merge|http://wiki.apache.org/lucene-java/SvnMerge] was very helpful, just
that I merged from 3x to trunk, while there it is recommended the other way
around. I think the two are equivalent, but had to go carefully with it.
Eventually these are the commands I ran:
{noformat}
cd trunk/lucene/src
svn merge -c 1066771
https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x/lucene/src
cd trunk/modules/benchmark
svn merge -c 1066771
https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x/lucene/contrib/benchmark
cd trunk
svn merge --record-only -c 1066771
https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x
svn revert --depth empty modules/benchmark
svn revert solr
{noformat}
The record-only merge discarded, by itself, the (new) mergeinfo prop from
trunk/lucene/src, and updated the ones in trunk and trunk/src.
Note the use of *revert --depth empty* for reverting (all) property changes.
I'll keep this issue open for a day in case any problem is revealed with this
merge process which I am doing for the first time.
was (Author: doronc):
Committed:
r1066771 - 3x
r1067359 - trunk,
A comment about the merging and messaging the mergeinfo's.
The great [wiki page about
svn-merge|http://wiki.apache.org/lucene-java/SvnMerge] was very helpful, just
that I merged from 3x to trunk, while there it is recommended the other way
around. I think the two are equivalent, but had to go carefully with it.
Eventually these are the commands I ran:
{noformat}
cd trunk/lucene/src
svn merge -c 1066771
https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x/lucene/src
cd trunk/modules/benchmark
svn merge -c 1066771
https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x/lucene/contrib/benchmark
cd trunk
svn merge --record-only -c 1066771
https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x
svn revert --depth empty modules/benchmark
svn revert solr
{noformat}
The record-only merge discarded, by itself, the (new) mergeinfo prop from
trunk/lucene/src, and updated the ones in trunk and trunk/src.
Note the use of *revert --depth empty* for reverting (all) property changes.
I'll keep this issue open for a day in case any problem is revealed with this
merge process which I am doing for the first time.
> Improvements to contrib.benchmark for TREC collections
> ------------------------------------------------------
>
> Key: LUCENE-1540
> URL: https://issues.apache.org/jira/browse/LUCENE-1540
> Project: Lucene - Java
> Issue Type: Improvement
> Components: contrib/benchmark
> Reporter: Tim Armstrong
> Assignee: Doron Cohen
> Priority: Minor
> Fix For: 3.1, 4.0
>
> Attachments: LUCENE-1540.patch, LUCENE-1540.patch, LUCENE-1540.patch,
> LUCENE-1540.patch, trecdocs.zip
>
>
> The benchmarking utilities for TREC test collections (http://trec.nist.gov)
> are quite limited and do not support some of the variations in format of
> older TREC collections.
> I have been doing some benchmarking work with Lucene and have had to modify
> the package to support:
> * Older TREC document formats, which the current parser fails on due to
> missing document headers.
> * Variations in query format - newlines after <title> tag causing the query
> parser to get confused.
> * Ability to detect and read in uncompressed text collections
> * Storage of document numbers by default without storing full text.
> I can submit a patch if there is interest, although I will probably want to
> write unit tests for the new functionality first.
--
This message is automatically generated by JIRA.
-
For more information on JIRA, see: http://www.atlassian.com/software/jira
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org
For additional commands, e-mail: dev-h...@lucene.apache.org
