[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 15:23:44 -0500

> 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
> the current feature branch where I'm seeing the problem.

The merge problem created them on the files in the branch. I don't know
why this happens. I have read the most of this was cleaned up in 1.5.5.

My question, do these properties show on the files in the WC of trunk or

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

There probably safe, but also if those files weren't change in trunk
then you can just revert them to. It's hard to say without actually
being able to look at your repo and see what is in trunk and branch etc.



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

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