You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-dev@jackrabbit.apache.org by Jukka Zitting <ju...@gmail.com> on 2014/04/16 21:22:38 UTC
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/...
Hi,
On Wed, Apr 16, 2014 at 9:46 AM, <al...@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
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/...
Posted by Jukka Zitting <ju...@gmail.com>.
Hi,
On Wed, Apr 16, 2014 at 3:40 PM, Alex Parvulescu
<al...@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
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/...
Posted by Alex Parvulescu <al...@gmail.com>.
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 <ju...@gmail.com>wrote:
> Hi,
>
> On Wed, Apr 16, 2014 at 9:46 AM, <al...@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
>