You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Oliver Preusche <Ol...@infoteam.de> on 2004/08/13 08:13:36 UTC

Bug during 'update' when locally modified directory got deleted i n repository.

Hi,

sorry I do not know if this bug has been reported earlier.
It seems to be a little bug, but it is quite time-consuming for me.

Situation:
1. 	You have a locally modified directory A/B/C as working copy.
	A/B/C is unter version control, and you have added files or
subdirectories not under version control.

2.	A/B/C got deleted in the repository after your last update.

Problems:
1.	'svn update' reports "Won't delete locally modified directory A/B"
	which is wrong because "C" is actually missing in the description.
	Svn tries to delete A/B/C but reports it tried to delete A/B.

2.	In A/B/.svn/entries and A/B/C/.svn/entries, the line 
		incomplete="true"
	remains, making the working-copy un-usable.

Regards
--Oliver

-----------------------------------------------------
Dipl. Inf. Oliver Preusche
infoteam Software GmbH / Am Bauhof 9 / D-91088 Bubenreuth
Tel +49-9131-7800-23 / Fax -50 / mailto:preusche@infoteam.de




---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Bug during 'update' when locally modified directory got deleted i n repository.

Posted by Ben Collins-Sussman <su...@collab.net>.
On Fri, 2004-08-13 at 03:13, Oliver Preusche wrote:
> Hi,
> 
> sorry I do not know if this bug has been reported earlier.
> It seems to be a little bug, but it is quite time-consuming for me.

This was fixed in svn 1.1.  See my transcript below.



[sussman@kepler:~/scratch]$ svnadmin create repos
[sussman@kepler:~/scratch]$ svn co file://`pwd`/repos wc
Checked out revision 0.
[sussman@kepler:~/scratch]$ cd wc
[sussman@kepler:~/scratch/wc]$ svn mkdir A
A         A
[sussman@kepler:~/scratch/wc]$ svn mkdir A/B
A         A/B
[sussman@kepler:~/scratch/wc]$ svn st
A      A
A      A/B
[sussman@kepler:~/scratch/wc]$ svn ci -m "add two dirs"
Adding         A
Adding         A/B
 
Committed revision 1.
[sussman@kepler:~/scratch/wc]$ svn up
At revision 1.
[sussman@kepler:~/scratch/wc]$ cd ..
[sussman@kepler:~/scratch]$ svn co file://`pwd`/repos wc-other
A  wc-other/A
A  wc-other/A/B
Checked out revision 1.
[sussman@kepler:~/scratch]$ cd wc-other/
[sussman@kepler:~/scratch/wc-other]$ svn rm A/B
D         A/B
[sussman@kepler:~/scratch/wc-other]$ svn ci -m "delete B"
Deleting       A/B
 
Committed revision 2.
[sussman@kepler:~/scratch/wc-other]$ cd ..
[sussman@kepler:~/scratch]$ cd wc
[sussman@kepler:~/scratch/wc]$ touch A/B/newfile
[sussman@kepler:~/scratch/wc]$ svn add A/B/newfile
A         A/B/newfile
[sussman@kepler:~/scratch/wc]$ svn st
A      A/B/newfile
[sussman@kepler:~/scratch/wc]$ svn up
D  A/B
Updated to revision 2.
[sussman@kepler:~/scratch/wc]$ svn st
?      A/B
[sussman@kepler:~/scratch/wc]$ ls A
B/
[sussman@kepler:~/scratch/wc]$ ls A/B
newfile



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org