Here is the situation. Someone has removed a file (e.g., junk.txt) from svn repository by running "svn rm" and committing it. After that, you, instead of doing "svn update" first, removed the same file from your local svn copy by running "rm" command.
Now if you check svn status, you will get the following svn conflict message:
! C junk.txt > local delete, incoming delete upon update
In this case, it is svn removal and local removal that are in conflict. In order to resolve this svn conflict caused by locally deleted file, proceed as follows.
First, re-create the deleted file. It doesn't have to be the same original file. Any random file with the same filename is sufficient. After all we will remove it anyway.
Revert this file to the state expected by svn.
Check svn status of the file. The file should appear as a unversioned file, which means that it's now safe to remove it.
Finally go ahead and remove it.
Now you should not be seeing any svn conflict.
Subscribe to Xmodulo
Do you want to receive Linux FAQs, detailed tutorials and tips published at Xmodulo? Enter your email address below, and we will deliver our Linux posts straight to your email box, for free. Delivery powered by Google Feedburner.
Did you find this tutorial helpful? Then please be generous and support Xmodulo!
Latest posts by Dan Nanni (see all)
- How to install Suricata intrusion detection system on Linux - September 3, 2015
- How to switch from NetworkManager to systemd-networkd on Linux - August 31, 2015
- How to set up a system status page of your infrastructure - August 25, 2015