Re: Help Understanding why Merge keeps detecting folders as changed

On 30.10.2010 02:14, Mike Finch wrote:
> I have tags that store our release codebases. Every so often, I will merge
> specific trunk revisions into the tag working copy. However, I've noticed that
> when I commit these folders in the tag, it marks the folders as changed.
>
>
> Could someone shed some light as to why Tortoise asks to commit these folders,
> and if it's safe to ignore the folder level changes? If not, maybe explain
> under what circumstance it would pose a risk ...

The folders are shown as 'modified' because their svn:mergeinfo property
has changed. SVN adds info about your merge to the working copy in the
form of the svn:mergeinfo property.
This information is used to figure out what you've already merged so
that it won't get merged again.

You should always commit those changes. If you don't or if you remove
those property changes, subsequent merges will get very slow.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2677316
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].