[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

possible bug in TortoiseSVN - resolve conflict

From: Daniel Gyorfi <daniel.gyorfi_at_gmail.com>
Date: Thu, 10 Jul 2008 13:40:46 +0200

Hi!

Today, i have found that something in the "Resolved" option of
TortoiseSVN 1.5 is not correct.

it is not easy, but i try to be simple.

I looked up an older revision of the repo of my working copy in the
Log, then chose to "revert the changes of that revision".
During the merge, the dialog showed that there are conflicts.
After the merge, I opened the context menu of the conflicted file and
chose the "resolved" option. the state of the file changed to
"modified". after opening the TortiseDiff on this file, it showed the
_characters of the conflict_ still in the file.
The conflicted files disappeared (as I think TortoiseSVN deleted
them), so the TortoiseSVN thought that this is just a modified file.

The same happens when I select the Edit Conflict during the merge
dialog of the same revert. It opens the TortoiseMerge and shows that
there are actually _no conflicts_ whatsoever. So I close the dialog of
TortoiseMerge. After closing that, the "resolved" option becomes
available, so I select that.
In this case the same happens, the conflict files disappear and the
characters showing the conflicted part are still there.

These characters of course cause syntax error.

I think there is something wrong with the resolved option of
TortoiseSVN, because the one of TortoiseMerge is working well, as by
selecting it in the TortoiseMerge, it works just fine.

version info:
TortoiseSVN 1.5.0, Build 13316 - 32 Bit , 2008/06/21 07:55:29
Subversion 1.5.0, apr 1.2.12 apr-utils 1.2.12 berkeley db 4.4.20 neon
0.28.2 OpenSSL 0.9.8g 19 Oct 2007 zlib 1.2.3
MS Windows Server 2k3 sp2

I can provide more info, if needed.

thanks,

Daniel

PS: sorry if someone has already posted it, if so please reply the link.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-10 13:41:50 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.