[Subclipse-users] file remains in conflict error, empty error dialog

Hi!

I have a file with conflicts in the Outgoing window. It has a small yellow
triangle with an exclamation mark.

If I try Commit, I get an error dialog saying

org.tigris.subversion.javahl.ClientException: svn: Commit failed (details follow):
svn: Aborting commit: 'C:\Documents and Settings\bla\bla\bla\SomeFile.txt' remains in conflict
org.tigris.subversion.javahl.ClientException: svn: Commit failed (details follow):
svn: Aborting commit: 'C:\Documents and Settings\bla\bla\bla\SomeFile.txt' remains in conflict

If I right clik the file in the Outgoing windows and
select Edit Conflicts, I get an error dialog titled "Compare...",
a red ball with white X icon in it and an OK button.
Otherwise it is empty.

I will try the "Mark Resolved" menu next.

Basically it is a confusing situation.

Regards,
David

Versions used:
Eclipse : 3.4.1
Subclipse: 1.4.7
JavaHL: 1.5.5 (same with SVNKit 1.5.4)

---------------------------------------------------------------------
http://www.nosoftwarepatents.com Innovation, not litigation !

---
David Balažic                 mailto:david.balazic_at_hermes-softlab.com
HERMES Softlab                http://www.hermes-softlab.com
Zagrebska cesta 104           Phone: +386 2 450 8947 
SI-2000 Maribor
Slovenija
---------------------------------------------------------------------
"Be excellent to each other." -
Bill S. Preston, Esq. & "Ted" Theodore Logan
---------------------------------------------------------------------
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=1198522
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].