Re: roll back,merge and tree confilct

On Sun, Apr 10, 2011 at 11:26 PM, Gu <gshy2014_at_gmail.com> wrote:
> I used
> svn merge svn+ssh://repos/C_at_HEAD svn+ssh://repos/C_at_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
qazwart_at_gmail.com