[Subclipse-users] "local edit, incoming delete upon update" after adding to svn:ignore

Hi!

How to resolve this situation:

 - some files and folders are in the repository
 - a decision is made to remove (some of) them from the repository and put them into svn:ignore
 - the above is carried out
 - another WC that has those files modified is updated
Now the files in that WC are marked as "added (+), tree conflict" , details: "local edit, incoming delete upon update"

How to resolve this into this situation:
 - the changed files and folders stay in the WC, but are ignored (the don't appear as local changes)

I tried to resolve them with an external SVN tool (TortoiseSVN), but only got the status of the files changed to "new/added".
That is gray right arrow with a plus sign on them.

I use subclipse 1.8.21 in Eclipse 3.7.2

Regards,
David Balažic

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2013-12-09 14:54:08 CET