[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

How about a troubleshooting guide for tree conflicts?

From: Vesa Paatero <Vesa.Paatero_at_biolinscientific.com>
Date: Fri, 30 Aug 2013 12:49:54 +0000

Hi,

I've noticed that tree conflicts are a nasty thing that occur now and then but can take half a day to clear out. The tree conflict problem (or field of problems) runs contrary to SVN's attempt to be the intuitive and quirk-free alternative to SVN.
      In the past, when each directory of the working copy had its own .svn directory, it was easy to make a drop-in replacement of any mixed-up directory... but now that there is one central .svn for the working copy, you may have to discard the whole working copy in order to be able to make commits and use the system normally again.
      I just had a case where no combination of resolve, cleanup, revert or switch seemed to reset a file (marked with "D" for deletion) to any usable state. The reason was that an early (grand)parent directory was in an unusual state ("replaced" or something) but it took long for that to turn out as the reason why the file, a distant leaf in the directory tree, wouldn't revert from its deleted state.

Seasoned users and developers of SVN probably know some set of things to try to get quickly past a tree conflict problem. So how about making some sort of a FAQ or a trouble-shooting guide to make such knowledge to a wider audience?

Regards,
Vesa (Not on the list, please use Cc.)
Received on 2013-08-30 14:50:39 CEST

This is an archived mail posted to the Subversion Users mailing list.