Re: Replacing Files

Megs wrote:
> I have noticed that when I synchronise my branch with the trunk and
> someone has added a new directory and source files to this new
> directory in the trunk, when I commit these changes to my branch the
> new directory gets added but the source files and any sub directories
> get marked as replaced. Is this normal behaviour? I would expect the
> source files and subdirs to be added as well and not replaced.
>
Yes this is normal if you have mixed revisions. Mixed revisions, my
definition:

Where one or more objects (file / dir) does not have the same BASE
revision as its parent.

Note that even all of your files are fully up to date, you can still
have mixed revs. To make them non-mixed, do an update from the top
level. (Note that people who only update from the
Check-for-modifications dialog will end up with very mixed revs, and
hence messy tags and slow working copies)

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-08 14:05:30 CET