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

Bug with missing scheduled-for-delete dir

From: Miller, Eric <Eric.Miller_at_amd.com>
Date: Wed, 9 Jan 2008 10:02:17 -0800

I think this is another working copy bug. Could someone test this under
1.5?

Synopsis: A scheduled-for-delete path is removed via system command or
3rd party application. Depending on the contents of the working copy,
this may not be recoverable using svn commands.

Recipe using 1.4.4:
 svnadmin create repos
 svn co file://`pwd`/repos wc
 touch wc/afile
 mkdir -p wc/dir/subdir
 svn add wc/*
 svn ci -m '' wc
 svn up -N wc
 svn lock wc/afile
 svn rm wc/dir
 mkdir wc/dir2
 rm -rf wc/dir

Now we are somewhat hosed:
  % svn up wc/dir
  svn: Directory 'wc/dir' is missing

  % svn up -N wc/dir
  svn: Directory 'wc/dir' is missing

  % svn st -N wc
  ? wc/dir2
       K wc/afile
  D wc/dir

  % svn st -N -u wc
  ! ? wc/dir
  ? wc/dir2
       K 1 wc/afile
  Status against revision: 1

But... oddly enough we can remove the blockage:
  % svn unlock wc/afile
  'afile' unlocked.

And then through some trickery, restore the path:
  % svn up -N wc/dir
  D wc/dir
  Updated to revision 1.

  % svn up -N wc/dir
  A wc/dir
  Updated to revision 1.

All is well:
  % svn st -u wc
  ? wc/dir2
  Status against revision: 1

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-09 19:06:10 CET

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