Problem replacing directories

Hi,

I am trying to replace a directory in a newly-copied directory:

Starting with the following structure:
dir1
dir1/dir2
dir3

I want to replace create a new copy of dir1, with dir2 replaced by (a copy of) dir3:

$ svn cp dir1 dir1a
A dir1a

$ svn del dir1a/dir2
D dir1a\dir2

$ svn cp dir3 dir1a/dir2
svn: Cannot copy to 'dir1a\dir2' as it is scheduled for deletion

I have tried many work-arounds, but the only thing that actually seems to work is hacking the entries file in the .svn directory before performing the last command (deleting the entry for dir1a/dir2). Now, surely, this is not the way to do this. Is there a supported way of doing this? (There is another workaround: do a commit before the last copy. After the commit, the final copy _does_ work; however, that is an undesirable workaround.)

My system:

Windows XP, with a 1.5.2 client:

$ svn --version
svn, version 1.5.2 (r32768)
   compiled Aug 28 2008, 19:05:34

Copyright (C) 2000-2008 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (http://www.Collab.Net/).

The following repository access (RA) modules are available:

* ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
  - handles 'http' scheme
  - handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
  - with Cyrus SASL authentication
  - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' scheme

Any thoughts on this?

Best regards,

Nico

________________________________
The information contained in this message may be confidential and legally protected under applicable law. The message is intended solely for the addressee(s). If you are not the intended recipient, you are hereby notified that any use, forwarding, dissemination, or reproduction of this message is strictly prohibited and may be unlawful. If you are not the intended recipient, please contact the sender by return e-mail and destroy all copies of the original message.
Received on 2008-11-17 17:53:05 CET