Re: [Subclipse-users] Unable to mark property conflict as resolved

Daniel Serodio <daniel.listas@xxx.com.br> wrote on 09/06/2006 10:31:29 AM:

> > Those problem markers are a little more sensitive, Since you did not
> > resolve the conflict in Subclipse you probably just are not able to
> > trigger them to remove themselves. Have you tried committing? I
would
> > assume the commit dialog would be correct and the markers might go
away
> > after a commit.
> >
> I tried commiting, and got a
> org.tigris.subversion.javahl.ClientException: svn: Commit failed
> (details follow):
> svn: Aborting commit: '<project root>' remains in conflict.
>
> The commit dialog also shows the folder's property status as conflicted.
>
> The weird thing is that the exception's package is "javahl" even if I
> have JavaSVN selected.

Unless JavaSVN has a bug, which I think is very unlikely in this case,
then I'd have to say the error is accurate. The Subversion status must
still say there is a conflict. Was svn resolve ever run on the folder?

JavaSVN works by implementing the same Java Interfaces that are defined by
JavaHL. So the exception classes are also the same.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Wed Sep 6 17:25:20 2006