How to fix a tree conflict issue in SVN

Question

I am new to SVN.

I found a conflict message as below:

rahulv@SWS306 :~/sp/s2$ svn status M Gemfile M Gemfile.lock M config/intializers/secret_token.rb DC tmp > local dir unversioned, incoming dir add upon update D tmp/cache ? tmp/data D tmp/pids D tmp/sessions D tmp/sockets Summary of conflicts: Tree conflicts: 1 rahulv@SWS306 :~/sp/s2$ 

The problem occurred after updating with the "svn up" command.

How to fix this problem?

Answer 1

I had this problem today, and because I did not want to keep the current contents of the new version of the directory, a simple solution was:

 svn status # review current situation svn revert tmp # fix, replace tmp with right path for you svn status # verify there are no conflicts any more 

Of course, if there is any doubt that the existing directory that does not contain versions contains something valuable, first copy it to another location (and then, possibly add SVN after return if these files should be versioned).

Answer 2

The error message in the status output says everything:

 > local dir unversioned, incoming dir add upon update 

This means that you had the tmp created in your working copy using mkdir but did not add it to the repository (yet), although you probably already added it locally using svn add . When svn update starts, another tmp directory is issued from the repository, which will overwrite your tmp if you do not fix this problem.

As a rule, try not to work with the same parts of the project in the same branch / trunk with other people, as this will ultimately lead to conflicts of conflict merging unheard of proportions.

The following SVNBook chapters should read:

• "Work with structural conflicts" ,
• "Resolve any conflicts . "