[Subclipse-users] sublclipse screwed up and now am stuck.

I am the only user (no other people updating or commiting).

I used the latest eclipse and subclipse.

I simply used eclipse to rename a package. It marks the old one as empty and deted.

When I tried to commit, i got the dreaded

org.tigris.subversion.javahl.ClientException: A conflict in the working copy obstructs the current operation
svn: Commit failed (details follow):
svn: Aborting commit: 'D:\dev\sk_ws\ge-parent\ge-core\src\main\java\com\skillkash\ge\dao' remains in tree-conflict

Searching the web, I find lots of people with the same problem, but no fixes.

I tried updating everything - no difference.
I tried committing just one file in the new package - says chlid folder does not exist.

Tried to commit a delete of a file which had nothing to do with this and got:

commit -m "" D:/dev/sk_ws/ge-parent/ge-core/src/main/java/com/skillkash/ge/logic D:/dev/sk_ws/ge-parent/ge-core/src/main/java/com/skillkash/ge/logic/Jackpot.java
    A conflict in the working copy obstructs the current operation
svn: Commit failed (details follow):
svn: Aborting commit: 'D:\dev\sk_ws\ge-parent\ge-core\src\main\java\com\skillkash\ge\logic' remains in tree-conflict

Tried manually reparing stuff using tortoise and the repo-browser e.g. just commiting the new package directory. This worked. but now when I try and commit a file under that manually, I get:

Command: Commit
Modified: D:\dev\sk_ws\ge-parent\ge-core\src\main\java\com\skillkash\ge\service\AlreadyDoneException.java
Sending content: D:\dev\sk_ws\ge-parent\ge-core\src\main\java\com\skillkash\ge\service\AlreadyDoneException.java
Error: Commit failed (details follow):
Error: File not found: transaction '75-2b', path '/ge-core/trunk/src/main/java/com/skillkash/ge/service/AlreadyDoneException.java'
Finished!:

How can the file possibly not be found, its right there!

If I try and manually commit the deletion of the old package directory, using tortoise, I get the same:

Command: Commit
Error: Commit failed (details follow):
Error: Aborting commit:
Error: 'D:\dev\sk_ws\ge-parent\ge-core\src\main\java\com\skillkash\ge\dao' remains in tree-conflict
Finished!:

So I went into the tortoise repo browser, and deletd one of the deleted directories (and its single deleted file (logic/Jackpot.java). not it seems to be gone from the repository.
But its still on my local disk, even if I do update on the directory above, which produces:
Command: Update
Skipped: D:\dev\sk_ws\ge-parent\ge-core\src\main\java\com\skillkash\ge\logic
Completed: At revision: 75

What does this mean?

So Ive backedup my source, and now I start deleteing directories in the repository, in the hope that I can fix a problem which does not exist.

Of course, I lose all the revision history, and hope that I can replace my files from my backup later.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-08-18 20:14:06 CEST