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

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

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
not?

> So, am I safe if I commit these files to the branch or could there be
any
> 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.

BOb

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

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