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

Re: [Bug 343] New - Problems with multiple additions

From: Ben Collins-Sussman <sussman_at_newton.ch.collab.net>
Date: 2001-03-29 15:47:35 CEST

bugmaster@tigris.org writes:

> + echo "File Contents" > file
> + svn add file
> + svn ci
> + svn add file
> + svn ci
> +
> + I get the following output:
> + Adding ./file3
> +
> + svn_error: #21052 conflict at "/file3"
> +

Um, this isn't a bug.

If you add and then commit a file that already exists in the latest
tree, that's a commit conflict. Either your wc is out-of-date
(i.e. you didn't know the file already existed in the repos), or
you're not replacing the file correctly. If you want to replace file
with a *totally new* file by the same name, you must

  svn rm file
  touch file
  svn add file
  svn ci

> + mkdir dir
> + svn add dir
> + svn ci
> + svn add dir
> + svn ci
> +
> + I get this output:
> +
> + svn_error: #21040 file not found: filesystem `/home/kevin/projects/svn-
> + test/repos', revision `5', path `file://localhost/home/kevin/projects/svn-
> + test/repos/dir2'

Same situation here. The worst thing you can say is that our
error-reporting isn't descriptive enough. :)
Received on Sat Oct 21 14:36:26 2006

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