Re: svn commit: r1587906 - in /jackrabbit/oak/branches/1.0: oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ oak-lucene/ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ oak-lucene/src/test/java/org/apache/...

[Jukka Zitting]

Hi,

On Wed, Apr 16, 2014 at 3:40 PM, Alex Parvulescu
<alex.parvule...@gmail.com> wrote:
> ack. the issue there was the revisions also contained some benchmark stuff
> which I didn't need to merge into 1.0.

For future reference, an alternative solution that achieves the same
effect without diverging the mergeinfos would be:

    $ svn merge ...
    $ svn revert -R oak-run    # or manually edit the merge
    $ svn commit ...

BR,

Jukka Zitting