11.07.2015 Views

Version Control with Subversion - Login

Version Control with Subversion - Login

Version Control with Subversion - Login

SHOW MORE
SHOW LESS

Create successful ePaper yourself

Turn your PDF publications into a flip-book with our unique Google optimized e-Paper software.

<strong>Subversion</strong> Complete Reference--depth ARG--diff3-cmd CMD--dry-run--extensions (-x) ARG--force--ignore-ancestry--quiet (-q)--record-only--reintegrate--revision (-r) REVExamplesMerge a branch back into the trunk (assuming that you have an up-to-date working copy ofthe trunk):$ svn merge --reintegrate \http://svn.example.com/repos/calc/branches/my-calc-branch--- Merging differences between repository URLs into '.':U button.cU integer.cU MakefileU .$ # build, test, verify, ...$ svn commit -m "Merge my-calc-branch back into trunk!"Sending .Sending button.cSending integer.cSending MakefileTransmitting file data ..Committed revision 391.To merge changes to a single file:$ cd myproj$ svn merge -r 30:31 thhgttg.txtU thhgttg.txt266

Hooray! Your file is uploaded and ready to be published.

Saved successfully!

Ooh no, something went wrong!