Re: mismatched merges

2012-02-08 Thread Stefan Sperling
On Wed, Feb 08, 2012 at 10:45:56AM +, Hoefakker, Paul wrote: > Hello, > > We are using: > SVN client 1.6.13 on windows > SVN server 1.6.12 as server > > We are looking for a solution of next issue: > If we make a selective merge from our trunk to a subbranch and changes are > made on the end

mismatched merges

2012-02-08 Thread Hoefakker, Paul
Hello, We are using: SVN client 1.6.13 on windows SVN server 1.6.12 as server We are looking for a solution of next issue: If we make a selective merge from our trunk to a subbranch and changes are made on the end of a file also changes which were not made in the selected revision range are tak