On Sun, Mar 07, 2004 at 10:57:46PM +0000, Philip Martin wrote:
> >> That's a different error, it doesn't mention a file. I think you have
> >> an unversioned file or directory somewhere under server/config.
> > If there is an unversioned file, I'd expect "svn st" to mention it?
> server/config is unversioned, status won't look inside it.
>
> >> It is true, you ran "svn up" after the revert and it deleted
> >> server/config and made it unversioned.
> > If this were true, server/config should have been removed...
> No, because it contains an unversioned item.
This is inconsistent.
Either there _was_ an unversioned item withhin server/config, then
server/config should not be assigned the unversioned status in the
first place.
Or there was _no_ withhin server/config unversioned item, then the directory
should have been removed.
Current behavior seems to be somewhat half-baked.
I tried to make a simple reproduction recipe and can now see what caused
the problem. It was an emacs backup file that prevented "svn up" from
working as expected. This looks like a bug to me, since emacs backup
files are in my global-ignores configuration setting. Below is the
reproduction recipe attached. If the line with the tilde is removed
from this command sequence, the "svn up" with the attached comment
succeeds (as expected).
cd ~
rm -rf testrepos wc1 wc2
export REPOS=~/testrepos
svnadmin create $REPOS
svn co file://$REPOS wc1
mkdir -p wc1/foo/bar
echo blah >wc1/foo/bar/baz
echo blah >wc1/file1
(cd wc1; svn add foo file1; svn ci -m first; svn up)
svn co file://$REPOS wc2
echo blah >>wc2/foo/bar/baz
echo blah >>wc2/foo/bar/baz~
echo blah >>wc2/file1
(cd wc1; svn rm foo; svn ci -m remove; svn up)
(cd wc2; svn up)
(cd wc2; svn revert foo/bar/baz)
(cd wc2; svn up) # this line should succeed in removing the directory
(cd wc2; svn up)
(cd wc2; svn up)
--
-- Josef Wolf -- jw@raven.inka.de --
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 8 19:50:23 2004