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

Re: Possible bug with add and update

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-09-12 07:13:03 CEST

Jeff Putsch <putsch@mxim.com> writes:
> o Each creates a file called "baz"
>
> o Each "adds" a file called "baz" (now it's marked locally for adding)
>
> o u2 commits baz
>
> o u1 tries to commit baz, it fails as it should
>
> o u1 tries to update baz, it fails until baz is moved out of the way
>
> o u1 moves baz out of the way and updates the working copy. baz
> is updated from the repository.

When you say "moved out of the way", do you mean Unix mv (or the
Windows equivalent)? You don't mean 'svn rm', right?

> o u1 tries to commit. The commit fails because baz cannot be added
> to the repository.

Sounds like a bug. If u1 only renamed the file out of the way, and
didn't affect its added status in Subversion, then u1's update should
have failed because the added entry still exists.

> The last item/behavior seems like a bug to me. u1's update of baz from
> the repository should have cleared the "add" setting in the local
> working copy, but it doesn't.

Well, it shouldn't clear an `add' setting, but it should respect that
setting and claim a conflict, thus requiring the user to clear the add
setting before the update will succeed.

> I've attached a short shell script that will demonstrate the problem
> clearly.

Cool!

Sounds like a bug to me too. Can you file it as an issue?

Thanks,
-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 12 07:35:34 2002

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