[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: <blackhole_at_collab.net>
Date: Wed, 25 Feb 2009 12:14:38 -0800 (PST)

>
> 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.
>

I'm aware of this, but I don't understand why there are any property changes on these files. These files have never been merged. They were added to trunk, and copied several times to tags. And they were copied to the current feature branch where I'm seeing the problem.

> 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.
>

So, am I safe if I commit these files to the branch or could there be any problems in the future?

Thanks a lot for your help.

Martin

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-25 21:18:31 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.