Re: Conflicts between added files.

Vladimir Prus <ghost@cs.msu.su> writes:

> Suppose I've added a file in WC.

You mean, there is a file scheduled for addition, but not yet
committed? Or do you mean that it's been committed?

> Then I send a patch to and it's applied in the repository. I update
> and get an error, saying that the file already exists.

I'm sorry, I don't understand your scenario. Can you give a recipe in
terms of specific svn commands?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 25 14:00:59 2002