Visual SVN/Tortoise 'Delete - keep local' problem.

views:

120

answers:

Visual SVN/Tortoise 'Delete - keep local' problem.

I wanted to remove some files from the repository (while leaving them locally), and stop tracking them in the future.

I tried this: - Used Tortoise 'Delete - Keep local' on the directory I wanted to remove from versioning. - Comitted to the repository.

This commit failed with this error: commit failed... item is out of date

Can anyone tell me

a) What the correct procedure is for this?

b) What can I do to get back to a working repository?

Thank you!

+2 A:

You need to first run svn update before you commit your changes. Then you can run svn del <file> to remove the files. Then try your commit again.

webdestroya 2010-05-15 19:20:44

Ok, I ran update, then 'svn delete' on the folder in question, and tried to commit again. The commit failed with the following error: Aborting commit: 'xxxx' remains in conflict. Any ideas?

UpTheCreek 2010-05-16 07:21:27

I ran 'svn resolve' on the folder, and it seems to be ok now. Can anyone tell me what the propper process is in the future for removing items from versioning with tortoise? (e.g. obj and bin folders).

UpTheCreek 2010-05-16 07:29:22

Update - it seems that the above deleted the local directory, which I didn't want to do.

UpTheCreek 2010-05-16 07:46:19

ansaurus

tags:

views:

answers:

Visual SVN/Tortoise 'Delete - keep local' problem.

related questions