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

Update that removes a modified file

From: Philip Martin <pmartin_at_uklinux.net>
Date: 2001-11-06 00:57:30 CET

Hi

Well, you fixed my last bug so quickly, I looked for another :-)

If a file has local modifications, and I update the working copy to a
version in which the modifed file does not exist, then the file's
entry in .svn/entries is not removed. If I subsequently try to update
to a version where the modifed file does exist I get an "Obstructed
update" error.

 $ svn up -r11 trial
 $ svn st trial/another_foo.c
 M trial/another_foo.c
 $ svn up -r12 trial
 D trial/another_foo.c
 $ svn up -r11 trial

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

Removing the working copy file does not solve the problem, to fix it
I also need to edit .svn/entries.

In svn_wc_remove_from_revision_control() there is a check for a
modifed file, if the file is modified the function aborts leaving the
modified working copy, the text-base, the name in .svn/entries, etc.

Leaving the modified file in the working copy is probably a good idea,
(although renaming it might be better) but shouldn't the admin bits be
deleted? Not sure where any property modifications could be kept,
perhaps they do just have to be deleted?

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.