[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: Kevin Pilch-Bisson <kevin_at_pilch-bisson.net>
Date: 2001-03-29 16:03:41 CEST

On Thu, Mar 29, 2001 at 07:47:35AM -0600, Ben Collins-Sussman wrote:
> 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

I wasn't trying to replace it, I was just testing strange cases. What I
meant was that the second svn add (note add, not commit) above should have
said, "Wait, I already have `file' in the repository, I can't add it again."

Then if someone was trying to replace a file, they would be able to do
as you say below. Otherwise, they just end up with a locked working
copy, for something that should have been either a no-op, or an earlier
error message.
>
> 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. :)
>

I guess that is sort of what I meant.

-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Kevin Pilch-Bisson                    http://www.pilch-bisson.net
     "Historically speaking, the presences of wheels in Unix
     has never precluded their reinvention." - Larry Wall
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

  • application/pgp-signature attachment: stored
Received on Sat Oct 21 14:36:26 2006

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