From FaithHighway Wiki

!!! Important !!! If, you not sure in result - use VisualSVN Server for local testing. If you will crash something - we will banish you on galley... or push you fix SermonConnects bugs. Not joke... !!! Important !!!

Contents 1 Working rules 2 Merging 2.1 Merging rules 2.2 Tools for SVN merge 3 Locking and all around... 4 Tools 5 Training materials

[edit] Working rules

• Try to write good comments
• Do logical commits. If you did changes for different tasks - do several commits with different comments.
• If commit was made because of some Trac ticket, comment should be like:

 #ticketNumber Comment text
 Example
 #345  New type of filter (current user) was added.

• Create checkout of whole http://masterchief.faithhighway.com/d360-core/trunk/ into Z:\home\ecrm.test\ (not only http://masterchief.faithhighway.com/d360-core/trunk/www/ into Z:\home\ecrm.test\www\)

[edit] Merging

[edit] Merging rules

1. Be sure you understand this process before use SVN merge on real repo. Please read:

• Tortoisesvn help about merge
• Realy good post about SVN merge - read it pleas. Short and clear.
• Chapter 4. Branching and Merging of SVN book. RUS version

2. Download VisualSVN Server play with branches on local test repository.

3. !!! In your Working Copy commit all changes before do any merging. This will let you make easy revert if something will be wrong.

4. In Merge dialog of TortoiseSvn use Diff, after Dry Run and only after Merge

5. !!! After merge in WC do commit with comments.

Merge changes from trunk to your brunch:

MERGE /path/to/trunk/ RevFrom:RevTo
Example:
MERGE /trunk/ 146:151 

Merge your changes from your brunch:

MERGE /path/to/brunch/ RevOfBrunch
Example:
MERGE /brunches/anton_dataset_changing/ 157

[edit] Tools for SVN merge

* http://subversion.tigris.org/merge-tracking/
* http://kenkinder.com/svnmerge/

[edit] Locking and all around...

We do not need it right now, but just to have information.

• http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-locking.html
• http://svnbook.red-bean.com/en/1.4/svn.basic.vsn-models.html#svn.basic.vsn-models.lock-unlock
• http://blogs.open.collab.net/svn/2007/07/from-the-questi.html
• http://svnbook.red-bean.com/en/1.4/svn.advanced.locking.html

[edit] Tools

• VisualSVN Server - one click install SVN server for Windows.
• http://code.google.com/p/svn-time-lapse-view/
• SvnNotifier - Tray tool to track repo changes.

[edit] Training materials

• http://voituk.kiev.ua/2008/03/04/subversion-for-non-programmers/
• http://svn.collab.net/repos/svn/trunk/doc/user/svn-best-practices.html
• http://www.polarion.org/index.php?page=download&project=subtrain
• http://svnbook.red-bean.com/

---

Do not read this - just not to foreget sometinh

• http://www.phpundercontrol.org/about.html
• Run unit tests
• Clean up JavaScript comments
• Compare live and developer DB
• For any deployed application have text file with about revision and etc - Solution
• Update live site verison