[
https://issues.apache.org/jira/browse/LUCENE-3023?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Uwe Schindler updated LUCENE-3023:
----------------------------------
Attachment: LUCENE-3023-svn-diff.patch
Here is the final SVN diff. To work around some itches with SVN, the following
was done:
- reverted everything outside lucene sub folder
- used the previously created manual diff to get a list of all changed files
(using patchutils command lsdiff)
- used "svn -q status | sed 's/^........//' > ../svn-files.txt" to get all
files affected after merge
- intersect both files (lsdiff and svn status one) to find all files that are
in reality unchanged, but still affected by SVN (these are all files that were
added after branching - this is a known limitation of SVN. Files added after
branching are "replaced" by merge reintegrate, loosing all history). Store
those files in unchanged.txt
- use the intersected filelist and revert everything: cat ../unchanged.txt |
xargs svn revert
- finally do a record-only merge again to fix mergeprops reverted by the
previous revert
My checkout is now ready to commit.
If we have some minor problems with the patch, please wait with fixing after
commit. If there are serious problems, we can fix them in realtime branch and
merge manuall (I can do that later).
> Land DWPT on trunk
> ------------------
>
> Key: LUCENE-3023
> URL: https://issues.apache.org/jira/browse/LUCENE-3023
> Project: Lucene - Java
> Issue Type: Task
> Affects Versions: CSF branch, 4.0
> Reporter: Simon Willnauer
> Assignee: Simon Willnauer
> Fix For: 4.0
>
> Attachments: LUCENE-3023-svn-diff.patch, LUCENE-3023.patch,
> LUCENE-3023.patch, LUCENE-3023.patch, LUCENE-3023.patch,
> LUCENE-3023_CHANGES.patch, LUCENE-3023_CHANGES.patch,
> LUCENE-3023_iw_iwc_jdoc.patch, LUCENE-3023_simonw_review.patch,
> LUCENE-3023_svndiff.patch, LUCENE-3023_svndiff.patch, diffMccand.py,
> diffSources.patch, diffSources.patch, realtime-TestAddIndexes-3.txt,
> realtime-TestAddIndexes-5.txt,
> realtime-TestIndexWriterExceptions-assert-6.txt,
> realtime-TestIndexWriterExceptions-npe-1.txt,
> realtime-TestIndexWriterExceptions-npe-2.txt,
> realtime-TestIndexWriterExceptions-npe-4.txt,
> realtime-TestOmitTf-corrupt-0.txt
>
>
> With LUCENE-2956 we have resolved the last remaining issue for LUCENE-2324 so
> we can proceed landing the DWPT development on trunk soon. I think one of the
> bigger issues here is to make sure that all JavaDocs for IW etc. are still
> correct though. I will start going through that first.
--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
