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 <[email protected]>wrote: > Hi, > > On Wed, Apr 16, 2014 at 9:46 AM, <[email protected]> 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 >
