SVN X remains in tree-conflict

svn tortoisesvn visualsvn-server tree-conflict
Paul Knopf picture Paul Knopf · Apr 13, 2010 · Viewed 36.8k times · Source

I am using VisualSVN (which uses Tortoise). I accidentally move a folder to a different location. When tries to move it back, SVN pukes with this error. It happened once before and I managed to do some random updates/commits, not knowing what I was doing and it was "fixed". I cannot pull the same magic again, so I need to know how to get my files and directory and of tree-conflict.

Thanks!

Answer

Brian R. Bondy picture Brian R. Bondy · Apr 13, 2010

I'm not sure what state it's in now, but your best bet would probably be to:

  1. Move the folder out of your repository completely
  2. Do an svn cleanup
  3. Do an svn update
  4. Copy the files from the folder back (without the .svn files) overwriting the old source files that were just svn updated.

Related questions

Working Copy Locked

I'm developing a web using subversion as version control, but got "working directory locked" error message Here's the story: I have PC-A: Windows XP Pro VisualSVN 2.5.2 Tortoise SVN 1.7.3 PC-B: Windows XP Home Tortoise SVN 1.7.3 I have create repository on PC-A …

Read More
SVN Commit failed, access forbidden

Recently I am facing problem of commit to SVN. The SVN server I am using is VisualSVN Server 2.5.9 and the client is TortoiseSVN 1.7.12. At first, one user is having problem to commit files to SVN. But that user still can …

Read More
Change repository on your folder with TortoiseSVN

I accidentally created a repository without the default folders in TortoiseSVN then did a checkout locally. Realized hey, I forgot to create that repository with the defaults so I deleted the repository using VisualSVN Server and then recreated the same …

Read More