Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

svn mkdir path/to/dir

Perform a merge

 

 

 

Warning
titleAdvanced Command

Merging is an advanced operation.  Always use '--dry-run' to check the results of the command before actually executing it.

 

...

  And always merge equivalent structure nodes when merging a branch back into the trunk, or you will screw up the trunk.

Merge a branch into the trunk:

...

After a merge, the changes are made to the local copy and must still be committed, using the usual commit command.

Make a branch

Warning
titleAdvanced Operation

Making branches is an advanced operation.  Ask a knowledgeable individual for advice before doing this for the first time.  After branching to make major changes, make sure to change your IDE / editor to use the branch instead of the trunk.

svn cp m "making a branch" ^/projects/foo/trunk ^/projects/foo/branches/foo-dev

Make a tag

 

Warning

Making tags is an advanced operation.  Most general users do not need to make tags, and for Maven projects this is done automatically during the release procedures.  Never change a tag once it is made.  Should changes be required, the preferred method is making them in the trunk and then making a new tag.

 

svn cp -m "making a tag" ^/projects/foo/trunk ^/projects/foo/tags/foo-1.2.3

...

svn revert path/to/broken/local/file

Tips and Warnings

Do not EVER checkout an SVN project into another Subversion structure node.  This has the potential to create some serious issues when executing Subversion commands, and it will also confuse you.

...