Re: Merging a branch back to trunk produces more changes than previewed (commit would perform a LOT of changes)

On Wed, 23 Sep 2009 17:18:05 +0200, Bob Archer <Bob.Archer_at_amsi.com> wrote:

> When you do a merge mergeinfo property is created. Usually if you do the merge into the trunk folder the mergeinfo property is only put onto the trunk folder. However, it seems that it is putting it onto many of your files. There are only two times I know of where this happens.
>
> 1. You are using an early version of 1.5 in which this is a bug.

You're talking about the client computer and the working copy? If so, I am using 1.6.5 there. But 1.5.3 on the server side.

> 2. You did a merge previously with an earlier version that had this bug... since SVN will update every file that already have the mergeinfo property on it then that could be why this is happening.
>
> Check the files in question that show as modified and see if they had the "mergeinfo" property on it before you do your merge.

I checked some files in the trunk working copy befor reintegrating the branch. Yes, there's an empty mergeinfo on them. So Probably that wasn't the first merge? Interesting. Maybe I experimented at some point in the past and can't remember.

So to summarize:
I'll now...
* upgrade clients and server to the latest version
* upgrade the repository to 1.6
* reintegrate the branch and do the commit

Stefan

-- 
Austrolektran at work
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2399211
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].