Just execute following SVN command: svn switch –relocate https://svn.exmaple.de/trunk https://repos.example.de/scm/svn/trunk where first argument is the current path to repository (execute ‘svn info’ for more details) and the second argument is a new path
Open your .profile file (on linux is .bashrc): mate ~/.profile Add following line: export trunk="https://svn.server.com/repo_name/trunk" And use $trunk with merge command: svn merge -c 3435 $trunk
Simple pattern: svn merge -r <REV FROM>:<REV TO> <FILE_NAME> Example: svn merge -r 20682:20681 data/js/game/filename.js Of course at the end you have to commit all changes.
export SVN_EDITOR=vim vim can be replaced with nano for instance, but not with mate, because its a graphical editor.
Merge commit to branch (from 2.19 -> context branch 2.20 for example): svn merge -c 16015 https://svn.server.com/branches/2.19 Resolving conflicts: svn resolve –accept mine-full data/css/game.css svn resolve –accept working data/css/game.css Updating to revision: svn update -r 16206 Cloning repository: svn co http://svn.example.com/branch/2.10 <target-directory> Adding files: svn add src/file.js src/file.php Updating to concrete revision: svn checkout -r… Read More »