Re: Question regarding reverse merge of added file

2018-01-11 Thread Johan Corveleyn
On Thu, Jan 11, 2018 at 3:48 PM, Max Bernhardt wrote: > Hi Johan, > > thanks for the reply. Sorry for the personal mail, but since I'm not > subscribed, this is the only way I know of to respond. > > No our client was still version 1.7.8, so this might have caused the > problem. > > The revert was

Re: Question regarding reverse merge of added file

2018-01-10 Thread Johan Corveleyn
On Mon, Jan 8, 2018 at 2:24 PM, Max Bernhardt wrote: > Hi all, > > We've just upgraded our subversion server from 1.4.6 to 1.9.7 and now I'm > getting a strange merge conflict, when I'm trying to do a reverse merge on a > baseline (trunk). > > The situation is as follows: > /project/branches/i

Question regarding reverse merge of added file

2018-01-08 Thread Max Bernhardt
Hi all,   We've just upgraded our subversion server from 1.4.6 to 1.9.7 and now I'm getting a strange merge conflict, when I'm trying to do a reverse merge on a baseline (trunk).   The situation is as follows:     /project/branches/it/33931/db/data_update.sql <- Branch created from /projec