Re: Reintegrate merge and other SVN 1.5 issues

golan davidovits wrote:
> Hi Stefan,
>
> Thanks a lot for your fast reply.
>
> First, I was happy to find out that sparse checkout is fully
> supported by Tortoise.
>
> I want to confirm with you my understandings from your reply (and
> previous threads you wrote):
>
>
> 1. If i work in branch reuse mode (repeating merges between trunk and
> branch) i should use the "Merge range of revisions" option and leave
> the revisions selection blank.

Yes.

> 2. About "mergeinfo" change in inner
> folders. I understand that It's something that can't be avoid in
> version 1.5. You have to commit or revert it. And it's going to be
> reduced in version 1.6. Is there any way (that i missed) that can
> help filter these modifications out from "check for modifications" or
> something else? Also, if some people commit the changes and other
> revert, isn't it going to cause a lot of conflicts in merges on these
> properties?

As mentioned, this should be improved in the upcoming 1.6 version.
In the meantime, you can check what exactly has changed from the commit
dialog by right-clicking on the column header and activating the
"property status" column. You can then see whether the file contents
have changed or only the properties of a file.

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=980227
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].