I've merged two branches (trunk and a development branch). A folder has dissapeared.
I'm working in command line and when trying to say svn resolve --accept working src/path/to/folder
the terminal spits out The node 'src/path/to/folder' was not found
After that it also spits out:
svn: E200009: Could not add all targets because some targets don't exist
svn: E200009: Illegal target for the requested operation
How can I force SVN to accept this change?
Thanks!
I was hitting this error trying to use TortoiseSVN to update a working copy. In my case I managed to workaround by using the SVN commandline interface instead to svn update
. Even after a successful commit I was still unable to update.
Very odd but a manual delete and update seemed to clean everything up. Both of my clients were based on Subversion 1.7.6.
It looks like some info is broken. Which seems to happen during merge with tree conflicts.
I had to fix the svn database which is the file .svn/wc.db.
WARNING! You are manipulating the svn database which can be harmful! Do this only if you have a backup and if this procedure does not help, restore the data from backup.
Change into the .svn directory make a backup of the wv.db (!) and run sqlite3 with wc.db as parameter. E.g.
\tools\sqlite3.exe wc.db
Search the entries causing the problem with
select * from actual_node where conflict_data like '%missing%';
or
select * from actual_node where conflict_data like '%obstructed%';
refine these queries until only the faulty actual nodes are listed. Also
select * from actual_node where local_relpath like '%...%';
is helpful to find the faulty nodes.
Remove the faulty nodes by replacing the select with a delete
delete from actual_node where conflict_data like '%missing%';
Check again with your favorite svn tool.
WARNING! You are manipulating the svn database which can be harmful! Do this only if you have a backup and if this procedure does not help, restore the data from backup.
For me it worked several times.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With