[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Conflicts between added files.

From: Vladimir Prus <ghost_at_cs.msu.su>
Date: 2002-11-25 14:19:48 CET

Ben Collins-Sussman wrote:
> 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?

Scheduled for addition.

>
>
>>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?
>

I do:

     svn add foo

and send "foo" to somebody else, who does:

     svn add foo
     <some minor edits of foo>
     svn ci

Then I do:

     svn up

and get the "obstructed update" error message.

- Volodya

---------------------------------------------------------------------
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:19:38 2002

This is an archived mail posted to the Subversion Dev mailing list.