Re: resolving obstructions

On Feb 23, 2007, at 11:01, Miller, Eric wrote:

> Can anyone tell me how to resolve the following scenario:
>
> -Setup the test:
> svn mkdir test
> touch test/afile
> svn add test
> svn ci -m 'testing'
>
> -Create an obstruction here:
> rm -rf test
> mkdir test
> touch test/bfile
>
> -See the obstruction:
> svn status
> ~ test
>
> What I want to do is check in the new test/ as a revision of the old
> test/.
> The rm, mkdir, and touch commands approximate a 3rd party application
> that removes and generates data with non-svn commands.
>
> How can I resolve this with svn commands and avoid temp files?
> I know you can fake it by using a clean .svn file from an update:
>
> mv test test_obs
> svn up test
> mv test/.svn test_obs
> rm -rf test
> mv test_obs test
> (delete missing, add unversioned)
> svn ci -m 'ugh' test
>
> I don't like this especially because of the need to do a full update
> just to get the .svn dir.
>
> Is there a better way?

If Subversion implemented this enhancement, then you could declare
the directory as opaque, and Subversion would not write into it:

http://subversion.tigris.org/issues/show_bug.cgi?id=707

But alas, it is not implemented.

-- 
To reply to the mailing list, please use your mailer's Reply To All  
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org