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

On Wed, 23 Sep 2009 16:32:56 +0200, Andy Levy <andy.levy_at_gmail.com> wrote:

> On Wed, Sep 23, 2009 at 10:05, Stefan M. Huber <looseleaf_at_gmx.net> wrote:
>> Hi!
>>
>> I couldn't find an answer in the archives. Maybe also because I didn't find the right keywords.
>>
>> Here's the situation:
>>
>> I have a trunk from which I branched off. I changed some files in the branch.
>>
>> After updating both branch and trunk to the most current revision, I wanted to merge the branch back into the trunk (using TortoiseSVN):
>>
>> The test merge showed about 10 files to be updated in the trunk.
>>
>> I executed the merge and the 10 files were updated. The merge took very long.
>> Afterwards, I noticed, that a lot of files (nearly every versioned file) was marked as changed. Indeed, a revert preview or a commit preview would change nearly every file. Although they have not been changed.
>
> What type of change? Content or properties? You're likely seeing the
> svn:mergeinfo properties being changed.
>
> What version of TSVN on your desktop & SVN on your server?

Client ("about" window of TortoiseSVN):

TortoiseSVN 1.6.5, Build 16974 - 32 Bit , 2009/08/20 08:13:46
Subversion 1.6.5,
apr 1.3.8
apr-utils 1.3.9
neon 0.28.6
OpenSSL 0.9.8k 25 Mar 2009
zlib 1.2.3

Server:
   svn --version
   1.5.3 (r33570)

I will upgrade the server to the most common release today.

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