Geek asks and answers

Replacing a directory with a copy of another directory in Subversion

Let's say the following two directories are in the repository:

currentproduction
development

I want too:

  • Rename currentproductionfor example. archivedproduction.
  • Copy revision 1234 from developmentas (new) currentproduction.

When i do

svn ren currentproduction archivedproduction
svn copy -r 1234 development currentproduction

Subversion is trying to copy developmentunder (to) currentproduction(which is already planned for removal):

A    currentproduction\development\file1.txt
A    currentproduction\development\file2.txt
Updated to revision 1234.
svn: Can't add 'currentproduction\development' to a parent directory scheduled for deletion

I assume this is because the directory is still in the working copy until commit. I could do with intermediate commit:

svn ren currentproduction archivedproduction
svn commit
svn copy -r 1234 development currentproduction

but it’s not very nice ... There is no way to tell Subversion I want to replace the directory with another?

+3
source share
3 answers

development currentproduction . , , .

currentproduction development, merge , currentproduction.

, , currentproduction ( a > 1.5). , .

// Know to which version a branche was created (XX)
svn log --stop-on-copy
svn merge -r XX:1234 development currentproduction

setup .

.

+1

currentproduction archivedproduction , , currentproduction.

0

I just went into the hidden folder .svncontained in the remote folder, deleting it, and then restarted my workspace (I use AhnkSVN in M ​​$ VisualStudio) and downloaded the file in the previously deleted folder without any problems.

In any case, back up the folder .svnbefore deleting it.

0
source

More articles:


All Articles