I have a folder in the trunk with the old directory structure, and the branch where several directories are grouped as subfolders of the new folder Was done:
Old (trunk)> Route / DIA / DIBB / DICR New (Branch) & gt; In the root / dirGROUP / dirA / dirB / dirC the new directory was moved with the command "svn move . There is a text dispute between the old die and the new Dyera.
And when I merge svn Http: //url.to.the.branch SVN bus old DIRA , Removes dirb , DIRC and gives me just new data structure, keeping in mind the conflicts between old and new DIA versions, such as That this file was merged with the new DIA in the file A position.
Does SVN default this sort of merge? If yes it has come to know that I have forgotten something - if no one - how to read SVN in keeping this confrontation in mind? It can now help, I have two solutions for this. The problem facing you may be overcome by these methods.
Solution 1:
Say that you have files
/ branch / foo Src / main / java / com / trunk / before going to src / com for src / test for test / com / src / com / branch / foo / test / com / trunk / src / main / java / com and / Src / test / java / com / java / com You could:
CD $ trunk svn merge -rnm: http: / / Server / branch / foo What you can do now:
cd $ trunk svn merge -r n: m http: // server / Branch / foo / src / com src / main / java / com svn merge -rn: m htt P: // server / branch / foo / test / com src / test / java / com or what could have been otherwise
resolution 2:
1) Get svn up to get the latest copy of the code (in old dior structure)
svn up 2) Unix command Copy in DIR DIR Structure
cp -r / root / dirA / root / dirGroup / cp -r / root / dirb / root / dirGroup / cp -r / root / dirc / Root / dirGroup / Now you have a local copy in the path you want.
3) Old delete files. 4) Add new files Add a d dirs svn Add dirA svn dirb svn dirc for all three dir Add svn ci
No comments:
Post a Comment