Re: merge problem with Tortoise

On 30.07.2009 08:42, Ilan Yaniv wrote:
> Hi all,
>
> We have a merge problem. When we are merging a revision from one branch
> to the trunk and selecting one file to merge in fact a bunch of files
> get merge, and then we have to make a revert to the files that we don’t
> want to merge.
>
> We have Tortoise 1.6.3 installed, with latest SVN server.
>
> Why is this happening?

I guess the other files are not really merged but only get the
svn:mergeinfo property set. You can of course revert those properties if
you like, but then subsequent merges will take longer than necessary.

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