subversion merging changes renamed files?


i have following problem controlling subversion:



i'm now operative box digest plan refactoring (which includes renaming files relocating files opposite directories).



at same someone else operative same digest branch.



at i wish combine changes finished bend behind trunk. includes changes finished files (on branch) have renamed trunk.



i tests seems presumably overthrow able following changes i'm blank someting (which i wish for). i tested controlling following book (should work bash, assumes an svn repository during ""):



svn co http://myserver/svn/sandbox

cd sandbox/

mkdir -p myproject/trunk myproject/branches myproject/tags

cat - <<eof >myproject/trunk/fileone.txt
test
1
2
eof

svn supplement myproject

svn dedicate -m "init"

# emanate branch
svn duplicate http://myserver/svn/sandbox/myproject/trunk http://myserver/svn/sandbox/myproject/branches/branch_1 svn duplicate http://myserver/svn/sandbox/myproject/trunk http://myserver/svn/sandbox/myproject/branches/branch_1

# rename file
svn pierce myproject/trunk/fileone.txt myproject/trunk/filetwo.txt

svn dedicate -m "renamed file"

svn transform

# change calm fileone branch

cat - <<eof >myproject/branches/branch_1/fileone.txt
test
2
3
eof

svn dedicate -m "changed branch"

# i try combine changes fileone behind filetwo
cd myproject/trunk/
svn combine -r1:head http://myserver/svn/sandbox/myproject/branches/branch_1
# nonetheless yields following message:
# skipped blank target: 'fileone.txt'


any assistance severely appreciated.



edit:
perhaps slight suggested mikegrb rather involuntary initial generating map renamed files (old->new) svn record management trunk:



svn record -v
------------------------------------------------------------------------
r33 | sme | 2008-10-09 15:17:54 +0200 (do, 09 okt 2008) | 1 line
changed paths:
d /myproject/trunk/fileone.txt
/myproject/trunk/filetwo.txt (from /myproject/trunk/fileone.txt:31)


resulting map: {fileone.txt => filetwo.txt}


now map change filenames patch record generated branch.



original:



index: fileone.txt
===================================================================
--- fileone.txt (.../trunk) (revision 31)
+++ fileone.txt (.../branches/branch_1) (revision 34)
@@ -1,3 +1,3 @@
test
-1
2
+3


modified:



index: filetwo.txt
===================================================================
--- filetwo.txt (.../trunk) (revision 31)
+++ filetwo.txt (.../branches/branch_1) (revision 34)
@@ -1,3 +1,3 @@
test
-1
2
+3


just an idea, haven't finished yet.



Comments

Popular posts from this blog

list macos calm editors formula editors

how hibernate @any-related annotations?

why does floated <input> control floated component slip over too distant right ie7, nonetheless firefox?