TortoiseMerge missing conflicts

Hi all,

recently I've run into this really strange situtation: I merged a set of revisions and Tortoise reported conflicts. So I click "Edit conflicts" and no conflicts are shown. Great. After some research, I stumbled across that: http://osdir.com/ml/version-control.subversion.tortoisesvn.user/2007-07/msg00095.html

So I check "Compare whitespaces" in TortoiseMerge's settings and voilá, there are the conflicts (see the attached screenshot). I've uploaded a video ( http://www.youtube.com/watch?v=Fp3FJzW1zXE ) to illustrate that the whitespace option really is the culprit.

Question/Issue 1: I can only assume that this is a _serious_ bug. There are no whitespaces whatsoever involved in the conflicts marked in lines 255 - 301 (check the screenshot). Can someone confirm or disconform this?

Question/Issue 2: Why does Tortoise show conflicts in lines 256 - 301?? Those lines aren't different. The only difference is in line 255!?

Can anybody tell what's going wrong here? If it is helpful, I can also provide the files where tortoise stores the revisions.

Thanks
Bernhard

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].