[TSVN] problem with tortoiseMerge after svn merge tag1 tag2

hi all,

I'm trying to merge the changes that happend between to tags into my working
branch and having problems with TortoiseMerge.

I've started my working branch as a copy of <tag1>.
In the meanwhile there is a new <tag2> in the repositiory.

I now tried to "svn merge <tag1>/<file> <tag2>/<file>" (or the tsvn
equivalent of that action respectively) resulting in a conflict situation.
There are now 4 files in my working copy: <file> (containing the merged
output incorporating the conflict markers), <file>.merge-left.rXY
(equivalent to <tag1>/<file>), <file>.merge-right.rXY (equivalent to
<tag2>/<file>)and <file>.working (the original file from my working copy).

I then try to "Edit Conflicts", but although there are definitely conflicts
in the merged <file>, none of them is shown as conflicting in TortoiseMerge.
Therefore I'm not able to resolve the conflicts using TortoiseMerge, but
have do do so by hand using my text editor.

Am I doing something wrong here?
I couldn't find anything about this topic in the documentation nor the
mailing list.

TIA Lorenz
Received on Mon Aug 16 15:04:26 2004