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

[Subclipse-users] "Resolved" tree conflict

From: Andreas Haferburg <haferbur_at_inf.fu-berlin.de>
Date: Fri, 10 Dec 2010 11:38:21 +0100


so I deleted the file x.java from package p. There was a tree conflict
involving this file, and I used the tree conflicts view to resolve it.
This was a couple days ago, so I don't remember exactly what happened.

Anyways, now my workspace is in a state where the file is gone
completely: When I create a patch, the deletion is not part of it, I
can't commit the deletion, and it doesn't show up in the synchronize
view. It's updated to HEAD, nothing is switched.
I can still see the file in the repository at p/x.java though.

Any way to fix this other than checking out again? How do I get the file
back in my workspace to delete it?

Any idea what went wrong?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-12-10 11:38:47 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.