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

RE: Re: Obtaining new .svn directories

From: Reedick, Andrew <jr9445_at_ATT.COM>
Date: Thu, 17 Jan 2008 14:05:56 -0600

Bleh, you need to run another round of 'svn update -N' on the dir\*.


rename the dir to dir.oops

svn co -N svn://server/repos/blah/blah/dir


## Run update -N for each file/dir in the broken dir

cd dir

svn ls

... listing of files and dirs...

svn update -N dir1 dir2 dir3 file1 file2 ...dirN fileN


## Now move the old workspace into the fixed directory

cd ..

move (or copy) dir.oops/* dir


Note: move dir.oops/* will not pick up the .svn file on most systems.
So make sure your equivalent move/copy command doesn't pick up the
defective/missing .svn dir.





From: James [mailto:excess_at_gmail.com]
Sent: Sunday, January 06, 2008 1:29 PM
To: Reedick, Andrew
Cc: users_at_subversion.tigris.org
Subject: Re: Re: Obtaining new .svn directories


> In theory, not that I've tried it recently, and with no guarantee of
> success, reliability, or data integrity, you could:
> rename the dir to dir.oops
> svn co -N svn://server/repos/blah/blah/dir
> move dir.oops/* dir/.
> run 'svn status' to see if it really worked. Maybe followed by
> an 'svn update'

I tried this and it didn't seem to work (the .svn directory was missing
entries for my files so it still complained about obstructing paths).

> Just curious - in this situation if I were to try 1.5, what would be
> the command
> that would restore the .svn dir. Is it 'svn co' or 'svn update'?

I've looked at the revision log for checkout-cmd.c and I found this:

Support --force option with svn checkout, update, and switch.
With the force option, co, sw, and up now tolerate unversioned
obstructing paths when adding new paths of the same type, rather than 
generating a SVN_ERR_WC_OBSTRUCTED_UPDATE error.
If the obstructing path is the same type (file or directory) as the
corresponding path in the repository it will be left 'as-is' in the
working copy.  For directories this simply means the obstruction is 
tolerated.  For files, any content differences between the obstruction
and the repository are treated like a local modification to the
working copy.
This patch is an expansion of one originally posted by Jonathan Gilbert 
<o2w9gs702_at_sneakemail.com> against the 1.2.0 tag.  See the various
"Takeover" threads on the dev mailing list.
This sounds like exactly what I needed but I'm not sure when 1.5 will be
available. Is there a patch available by chance? 
The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA622
Received on 2008-01-17 21:12:37 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.