jackrabbit-oak-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Parvulescu <alex.parvule...@gmail.com>
Subject 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/...
Date Wed, 16 Apr 2014 19:40:08 GMT
ack. the issue there was the revisions also contained some benchmark stuff
which I didn't need to merge into 1.0.

alex


On Wed, Apr 16, 2014 at 9:22 PM, Jukka Zitting <jukka.zitting@gmail.com>wrote:

> Hi,
>
> On Wed, Apr 16, 2014 at 9:46 AM,  <alexparvulescu@apache.org> wrote:
> > Modified:
> >     jackrabbit/oak/branches/1.0/oak-core/   (props changed)
> >     jackrabbit/oak/branches/1.0/oak-lucene/   (props changed)
>
> When backporting changes, it's better to always do the merging at the
> root of the branch, as otherwise we'll have a hard time properly
> tracking the merge history with mergeinfo.
>
> I removed these subdirectory mergeinfos in revision 1588040.
>
> BR,
>
> Jukka Zitting
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message