Re: roll back,merge and tree confilct

2011-04-11 Thread David Weintraub
On Sun, Apr 10, 2011 at 11:26 PM, Gu 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

Re: roll back,merge and tree confilct

2011-04-10 Thread David Weintraub
On Sun, Apr 10, 2011 at 10:00 PM, Gu wrote: > 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 kno

roll back,merge and tree confilct

2011-04-10 Thread 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 upd