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

[Subclipse-users] Subclipse states there is a conflict when there is not

From: Brandon Mayes <bdmayes_at_gmail.com>
Date: Thu, 24 Feb 2011 14:04:42 -0800 (PST)

Hi all,

I have noticed that after adding some files to my ignore list in Subclipse, each successive synchronization states that there is a conflict. When I attempt to view it by clicking on the conflicts button, the project name shows but there is no option next to it to expand anything. See attached screenshot.

The first thing I tried was to delete the project from Eclipse and then check it out again. The conflict was now gone, but came right back as soon as I started adding files to the ignore list. I did not modify any files in any way. Simply adding the same files back into the ignore list caused the conflict to show up again.

I also opened a terminal, performed a cd into the project directory, and then ran the "svn status" command. It does *NOT* list any files with 'C' status so the CLI version of svn does not think there is a conflict.

How do I clean up this conflict in Subclipse? Is there a log or command I can run to see what is going on here? Thanks!

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2707303

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].

screenshot1.png
Received on 2011-02-25 02:47:14 CET

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