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

Re: Update that removes a modified file

From: Philip Martin <pmartin_at_uklinux.net>
Date: 2001-11-06 16:29:38 CET

Ben Collins-Sussman <sussman@collab.net> writes:

> Philip Martin <pmartin@uklinux.net> writes:
>
> > $ svn up -r11 trial
> > $ svn st trial/another_foo.c
> > M trial/another_foo.c
> > $ svn up -r12 trial
> > D trial/another_foo.c
>
> This behavior alone is a bug, IMO. If
> svn_wc_remove_from_revision_control detects that the object has local
> mods, it should not just abort, but the user should see an "obstructed
> update" error of some kind. Is that happening, or did you leave that
> part out?

Perhaps not enough preamble:

$ svnadmin create /home/pm/repo
$ svn co file:///home/pm/repo -d wc
$ touch wc/foo.c
$ svn add wc/foo.c
A wc/foo.c
$ svn ci wc
Adding wc/foo.c
Commit succeeded.
$ svn up wc
$ svn rm wc/foo.c
D wc/foo.c
$ svn ci wc/
Deleting wc/foo.c
Commit succeeded.
$ svn up wc/
$ svn up -r1 wc
A wc/foo.c
$ echo foo > wc/foo.c

and now the original:

$ svn up -r1 wc
$ svn st wc
M wc/foo.c
$ svn up -r2 wc
D wc/foo.c

followed by

$svn st wc
M wc/foo.c
$ svn up -r1 wc

svn_error: #21017 : <Obstructed update>
  Can't add 'foo.c':
 object of same name already exists in 'wc'

Philip

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:48 2006

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