[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: mismatched merges

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 8 Feb 2012 12:19:12 +0100

On Wed, Feb 08, 2012 at 10:45:56AM +0000, 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 of a file also changes which were not made in the selected revision range are taken over. (All changes on the end of file are taken over).
>
> Is this a known issue and is there a possibility to prevent this? In our case in trunk some new functions where created at the end of a C++module file. After a while a new function to resolve a bug was added at the end. In the merge only the last change (bug solution) was selected. In the branches where the merge was made also the other functions where merged.

Hi Paul,

I wonder if you got a conflict during the merge?

Please read http://svn.haxx.se/users/archive-2011-10/0832.shtml
It explains a problem that sounds similar to yours. But I am not
sure if it is the exact same situation.

Are you really sure that Subversion was correctly told which changes
should be merged? Instead of describing your interpretation of what
happened, can you show which commands were used with which parameters,
and what the resulting output was? You may replace sensitive data like
names and paths in the output. Preparing this might take a bit more work
than writing a short email. But in a forum such as this it is a lot more
effective because people cannot look at your monitor from over here ;)
Received on 2012-02-08 12:20:21 CET

This is an archived mail posted to the Subversion Users mailing list.