Reputation: 7612
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!
Upvotes: 14
Views: 31960
Reputation: 651
For me I was using the "Test Merge" button in Tortoise SVN and I was getting this error. Eventually I just clicked "Merge" for real and the error didn't show...
Upvotes: 0
Reputation: 1
Had this too in Eclipse. I did several refresh, svn cleanup, etc but nothing helped.
Then I did SVN commit from the command line which worked fine.
Upvotes: 0
Reputation: 53
I had this problem occur due to the working copy being checked out using the DNS name of the server, e.g. http://myServer/svn/software/Trunk/ ; and the branch from which I was telling my SVN client to merge was the same branch, only being referenced directly by its IP address, e.g. http://10.140.1.29/svn/software/Branches/myBranch/ . Very easy to overlook when using a GUI-based client such as TortoiseSVN, and the cryptic error messages such as "node not found" don't really tell you anything. Hope this helps someone.
Upvotes: 2
Reputation: 11
I deleted the file's folder and updated it again. I found that doing this resolved this problem.
Upvotes: -1
Reputation: 2939
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.
Upvotes: 4
Reputation: 3274
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.
Upvotes: 7