[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: James <excess_at_gmail.com>
Date: Sun, 6 Jan 2008 11:28:37 -0700

> 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?
Received on 2008-01-06 19:29:02 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.