svn

Merge branch range to working copy branch (possibly head of trunk)

Have branch or trunk checked out and in a state ready to accept the merge

Browse the history of the branch to merge - need to know the version before the start of the change range to merge (n) and the version at the end of the change range to merge (m)

From the dir that is receiving the merge:

svn merge -r n:m svn-url-of-source-branch --dry-run

Validate that the merge changes are what you desire to occur:

svn merge -r n:m svn-url-of-source-branch

Resolve any conflicts, test, and commit.

Comments

Popular posts from this blog

Oracle JDBC ReadTimeout QueryTimeout

Generically load enum mapping via properties file