roll back,merge and tree confilct

[Gu]

Hi,
   I need to roll back to a particular version. I read this post
http://jacwright.com/blog/75/how-to-roll-back-changes-using-subversion/
It tells me to use merge to roll back. However, I failed due to a so-called tree conflict.  I don't know how to solve that problem.
I tried svn update and update seems successful. But after svn update, I still cannot use svn merge to roll back.,
Error: Attempt to add tree conflict that already exists.

Thank you.

[David Weintraub]

Can you show us the command you used and the exact error you got?

Normally, doing a rollback via Merge doesn't cause any issues unless
you're attempting to roll back something other than the previous
revision.

--
David Weintraub
qaz...@gmail.com

[David Weintraub]

On Sun, Apr 10, 2011 at 11:26 PM, Gu <gshy...@gmail.com> wrote:
> I used
> svn merge svn+ssh://repos/C@HEAD svn+ssh://repos/C@52 ./C

> Error: Attempt to add tree conflict that already exists.

> C is a name of the directory. I want to roll back the whole tree.
> It seems that I accidentally changed some tree structure.

Please alway reply to the list!

The simplest syntax is this:

$ svn merge -c -XXX file

Where XXX is the revision you want to remove from the source. For
example, you would probably want to do:

$ svn merge -c -52 #Remove changes made in version #52 from the file.

See if that helps.

--
David Weintraub
qaz...@gmail.com