Create and Merge SVN branches to the trunk (Linux commands)

Simple:

First, view branch information

Of course, the target branch must be download down before merging!!!

Directory CD to branch directory (branch)
1. Run SVN info: The only useful information: URL (branch SVN address)

SVN://192.168.1.80:3698/c/branches/pirate/rpcfw/specialactivety

2. Running

SVN Log--verbose--stop-on-copy | Tail-10

The only thing that is useful is the version number (r17888) when the branch was created, merging the sub-component to the Trunk directory CD to Trunk 1. Run SVN update: View the latest version number of the Repository (18665) 2. Run the SVN merge:

SVN merge svn://127.0.0.1/repos/main

Or

SVN merge-r 17888:18665 svn://192.168.1.80:3698/c/branches/pirate/rpcfw/specialactivety

-Left: Initial version tree-right: Target version tree pops up many options, select postpone delay conflict resolution 3.SVN revert: If merge error revert can undo merge three, resolve conflict 1. Run S VN Status: View merged information 2. Conflicting files generate four files

filename.merge-left.r18665              filename.merge-right.r17888               filename.working              filename

3. Modify the conflicts section in the filename file 4. Run SVN resolved filename to delete the generated redundant file 5. Commit Commit

SVN commit-m "test"   // submit  

IV. Create a branch command: to the upper directory of the home directory--"Add Main folder: SVN Add./dev Branch: SVN copy svn://127.0.0.1/repos/dev Svn://127.0.0.1/repos/branc H-m "test" View status: SVN log-v./branch/test.phpNote:

A), creating a branch, which can only be done within the same warehouse, is not possible across warehouses. Will prompt:

   Svn:no repository found in ' svn://127.0.0.1 '

b), when you create a branch, note that you add a comment, or the following error is reported.

[[Email protected] repos]# svn CP svn://127.0.0.1/repos/main svn://127.0.0.1/repos/ Branchsvn:could not use external editor to fetch log message; Consider setting the $SVN _editor environment variable or using the--message (-m) or--file (-' editor-cmd ' Run-ti Me configuration option was found

 

Create and Merge SVN branches to the trunk (Linux commands)