Hi,
I have a problem where I'm possibly simply doing something wrong. I wanted to do the following: I created a branch from trunk and made some modifications in the branch. One of the modifications was to delete a directory and replace it with a symlink of the same name. later on I merged the branch back into head. On the command line svn wrote after the merge "skipped name_of_symlink". After having committed the merge the directory had been deleted but the symlink not created. How do i have to proceed so *every* change from the branch is after the merge in trunk.
Here a short example from the coomand line (svn version is 1.5.2)
/tmp >svn co file:///usr/local/repository/testmerge/trunk testmerge
Checked out revision 1.
/tmp >cd testmerge/
/tmp/testmerge >mkdir dir1
/tmp/testmerge >mkdir dir2
/tmp/testmerge >mkdir dir1/ssi
/tmp/testmerge >mkdir dir2/ssi
/tmp/testmerge >svn add dir1
A dir1
A dir1/ssi
/tmp/testmerge >svn add dir2
A dir2
A dir2/ssi
/tmp/testmerge >svn ci -m 'before branch'
Adding dir1
Adding dir1/ssi
Adding dir2
Adding dir2/ssi
Committed revision 2.
/tmp/testmerge >svn copy -m 'Branch' file:///usr/local/repository/testmerge/trunk file:///usr/local/repository/testmerge/branches/testsymlink
Committed revision 3.
/tmp/testmerge >cd ..
/tmp >svn co file:///usr/local/repository/testmerge/branches/testsymlink testsymlink
A testsymlink/dir1
A testsymlink/dir1/ssi
A testsymlink/dir2
A testsymlink/dir2/ssi
Checked out revision 3.
/tmp >cd testsymlink/dir1
/tmp/testsymlink/dir1 >svn del ssi/
D ssi
/tmp/testsymlink/dir1 >svn ci -m 'deleted directory'
Deleting dir1/ssi
Committed revision 4.
/tmp/testsymlink/dir1 >cd ..
/tmp/testsymlink >svn up
At revision 4.
/tmp/testsymlink >cd dir1
/tmp/testsymlink/dir1 >ln -s ../dir2/ssi/
/tmp/testsymlink/dir1 >svn add ssi
A ssi
/tmp/testsymlink/dir1 >svn commit -m 'now symlink'
Adding dir1/ssi
Transmitting file data .
Committed revision 5.
/tmp/testsymlink/dir1 >cd ../../testmerge/
/tmp/testmerge >svn merge -r2:HEAD file:///usr/local/repository/testmerge/branches/testsymlink
--- Merging r3 through r5 into '.':
D dir1/ssi
Skipped 'dir1/ssi'
/tmp/testmerge >svn ci -m 'merged'
Sending .
svn: Commit failed (details follow):
svn: Directory '/testmerge/trunk' is out of date
/tmp/testmerge >svn up
At revision 5.
/tmp/testmerge >svn ci -m 'merged'
Sending .
Deleting dir1/ssi
Committed revision 6.
/tmp/testmerge >cd dir1/
/tmp/testmerge/dir1 >l
total 0
drwxr-xr-x 3 root root 72 Sep 29 09:30 ./
drwxr-xr-x 5 root root 120 Sep 29 09:25 ../
drwxr-xr-x 6 root root 208 Sep 29 09:30 .svn/
TIA
KP
Received on 2008-09-29 10:00:51 CEST