SVN update + Resolve conflict !!

Hi,

I have a working copy of my project checked out onto a server.

Ques - Can I have both uncommitted and committed data in the WC ?

The reason being I have close to 8000+ templates on that server off which 2000 are currently committed to SVN (The remaining aren't used but still needed as the user subscription hasn't expired completely).The problem is when I run svn update on WC it runs fine as long as there is no conflict w.r.t to data being already present in WC i.e. when I move a project to my repo and run SVN update on my WC it returns an error saying object of same name already exist. SVN status returns the following

! .

After this when I run svn update I get an error 400 (Bad request) or the connection times out.

Note - As long as I'm committing
 new projects to my repo (i.e no conflicts with existing projects) , svn update on my WC works fine. Is there a way I can resolve this

      See the Web's breaking stories, chosen by people like you. Check out Yahoo! Buzz. http://in.buzz.yahoo.com/

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2369621

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-10 11:30:32 CEST