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

Re: Question to Merging and Merge Tracking

From: Wim Coenen <wcoenen_at_gmail.com>
Date: Thu, 18 Sep 2008 14:40:29 +0200

2008/9/18 tmto <tmto_at_arcor.de> wrote:

> But if I check my working copy branch path with "check for modification"
> some other files has a change svn property "svn:mergeinfo that has change
> form "Working Base" to "Working Copy". May be OK but why not all files? I
> don`t understand?
>

After upgrading our svn server from 1.4 to 1.5 and doing a merge, I also
noticed that the svn:mergeinfo property was set or changed on files that
were unrelated to the merge. The files in question all had one thing in
common: they were moved or copied at some point in their history.

I believe this is an effect of the 1.4 -> 1.5 transition. It seems to occur
only the first time when you merge changes into a specific location.

I don't claim to fully understand why this happens, but I suppose a thorough
reading of
http://www.collab.net/community/subversion/articles/merge-info.html will
yield the answer.

HTH,

Wim Coenen
Received on 2008-09-18 14:40:36 CEST

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