Page Comparison

...

1. Ensure the branch is working and committed to SVN.
2. To see what changes and/or branches are available for importing, use this command from the branch distribution:

   Code Block
   python svnmerge.py avail -l

   • Windows Users: One of the results should be '/PLFM/trunk'.
3. import the changes from trunk into the branch:
   • to merge all changes

     Code Block
     python svnmerge.py merge

   • to merge one or more particular changes

     Code Block
     python svnmerge.py merge -r #,#,#

   • Windows Users: to merge all changes

     Code Block
     python svnmerge.py merge -S /PLFM/trunk

4. Resolve conflicts, compile, test and commit EVERYTHING in the branch.

   Code Block
   svn ci -F svnmerge-commit-message.txt

Merge from your branch to trunk

...

• Firebug http://getfirebug.com/
• Fiddler http://www.fiddler2.com/fiddler2/

UML Tools

Class Diagrams

UMLet 11.2 is a "Free UML Tool for Fast UML Diagrams" http://www.umlet.com/

Sequence Diagram Editors

Don’t waste your time with drawing programs when you can just write something similar to psuedocode.

...