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

RE: After a merge some files are (erroneously?) shown as modifed

From: Bob Archer <bob.archer_at_amsi.com>
Date: Wed, 25 Feb 2009 12:00:14 -0500

> As an example, I see lots of files in my working copy with the
following
> difference/modification:
>
> Property changes on: C:\Projects\MyProj?ect-branchXY\libs\?SomeLib.dll
> ____________________?____________________?____________________?_______
> Modified: svn:mergeinfo
> Merged /trunk/libs/SomeLib.?dll:r2718-2814

Property changes on a file are still considered changes. This is
mergeinfo on the trunk that was probably created when some other branch
was merged into it.

Also, some of the older versions were a little verbose with mergeinfo
properties so it may be that those on the branch are not actually
needed. But, you really need to understand when this is the case before
removing them.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1227676

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-25 18:00:25 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.