> The weird thing is that the exception's package is "javahl"
> even if I have JavaSVN selected.
That is normal, JavaSVN transparently replaces JavaHL.
Alexander Kitaev,
TMate Software,
http://tmate.org/
> -----Original Message-----
> From: Daniel Serodio [mailto:daniel.listas@xxx.com.br]
> Sent: Wednesday, September 06, 2006 16:31
> To: users@subclipse.tigris.org
> Subject: Re: [Subclipse-users] Unable to mark property
> conflict as resolved
>
> Mark Phippard wrote:
> > Daniel Serodio <daniel.listas@xxx.com.br> wrote on
> 09/05/2006 05:59:58 PM:
> >
> >
> >> I had a conflict in a project root's svn:ignore property, which I
> >> resolved using TortoiseSVN. Now, Subclipse still thinks that this
> >> property is in conflict (the "SVN Properties" view says
> "Conflict on
> >> one or more properties"), but "Mark resolved" and "Edit conflicts"
> >> are disabled. I've tried refreshing the project, closing and
> >> re-opening it, and synchronizing it, but it didn't make a
> difference.
> >> TortoiseSVN shows the property in question as "modified".
> >>
> >
> > 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.
>
> TIA,
> Daniel Serodio
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
> For additional commands, e-mail: users-help@subclipse.tigris.org
>
>
---------------------------------------------------------------------
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:23:43 2006