Re: r1794536 broke 1.9.x-strict-rep-sharing

2017-05-27 Thread Stefan Fuhrmann 

On 24.05.2017 23:20, Stefan Fuhrmann wrote:

Probably some subtle overlook in the conflict resolution.
Shouldn't be too hard to find & fix.

I'll do that tomorrow.


With the help of stsp, this one is fixed now.
Would be nice if somebody reviewed the patch
such that the mergebot can unbreak 1.9.x .

-- Stefan^2.

r1794536 broke 1.9.x-strict-rep-sharing

2017-05-24 Thread Stefan Fuhrmann 

Probably some subtle overlook in the conflict resolution.
Shouldn't be too hard to find & fix.

I'll do that tomorrow.

-- Stefan^2.