[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-dev
Subject:    Problem with deleting and copying of directories. (1.1 rc1) / Maybe Issue 1516
From:       Jan_Mönnich <Jan.Moennich () newtron ! net>
Date:       2004-07-29 15:31:25
Message-ID: 65DC2543CB5C3141B650F9D2247C83538B83D9 () hermes ! newtron ! internal
[Download RAW message or body]

Hello,

liking joining branches with cvs I want to tag my branches to avoid double merges:
Example for branch "productive":
- remove tag productive_merge1	
	(cvs rtag -d productive_merge1 path1 path2 ... pathn)
- set tag productive_merge1 from productive_merge2 
	(cvs rtag -r productive_merge2 productive_merge1 path1 path2 ... pathn)
- remove tag productive_merge2	
	(cvs rtag -d productive_merge2 path1 path2 ... pathn)
- set tag productive_merge2 from branch 
	(cvs rtag -d productive productive_merge1 path1 path2 ... pathn)
- join all changes into my working copy
	(cvs co -j productive_merge1 -j productive_merge2 path1 path2 ... pathn)


With subversion it should be the same. But I want to avoid unnecessary revisionnumber (4*n revisions) so
I dont want to make all in repository (svn rm svn://.../trunk/productive_merge1/path1 ...).

So I try to make the changes locally:

svn -N co svn://.../ .
svn -N up branches tags
cd tags
svn -N up productive_merge1 productive_merge2
cd ../branches
svn -N up productive
cd ../tags/productive_merge1
svn -N up path1 path2 ... pathn
svn del path1 path2 ... pathn		
	// This deletes productive_merge1
cd ../trunk/productive_merge2
svn -N up path1 path2 ... pathn
svn mv path1 ../productive_merge1/path1
// Ups, this do not work because ../productive_merge1/path1 still exists and 
// it tries to move it into ../productive_merge1/path1/path1

So ist there the possibility to rename a directory to the name of a deleted directory??
Or is there another approach for the moving of tags?

jan



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org


[prev in list] [next in list] [prev in thread] [next in thread]