Re: Bogus conlicts with Test merge

Wolf Peuker wrote:
> Hi folks,
>
> today I wanted to merge a whole developer branch into the trunk. Some
> revisions from this branch I decided to skip as a result of analysis of
> possible conflicts. That's why I had a list of revision ranges.
> Nevertheless, when I started the /Test merge/, I got a list of crazy
> conflicts. I was shocked but curious if I could resolve them, and I
> decided to /Merge/. Now the surprise happened: no conflicts at all!
>
> Although I'm very happy now, is this behavior well-known, is it tsvn or
> svn stuff, and shouln't it be mentioned in the TortoiseSVN help?

That's a well known issue. The 'test merge' doesn't really do the merge
but only checks which files *might* get a conflict.

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