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

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?

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2398905

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-23 16:34:10 CEST