User:Chloe

Contents 1 Java 1.1 Evaluating performance on a Mac 1.2 Eclipse 2 Subversion 2.1 Merging a branch 2.2 Diff by revision 2.3 Revert to a previous version of a file 3 Useful links

Java

Evaluating performance on a Mac

Eclipse Test & Performance Tools aren't supported on Mac OS X due to this bug. However, Mac ships with a profiler (you need to install the development tools), Shark, that supports Java. You can find it at /Developer/Applications/Performance Tools. Here's how to get it working:

1. Add -agentlib:Shark to your VM arguments (i.e. in the run configuration for Eclipse)
2. Start Shark, and pick 'Java Time Profile' or another Java option in the first drop down
3. Start your application
4. Click Start in Shark
5. Click Stop, or Shark should stop after 30 sec.

Eclipse

Eclipse will hang on launch if it didn't exit cleanly (e.g. if the system hangs). To resolve this, go into the workspace directory, then delete .metadata/.plugins/or.eclipse.resources/.safetable/.snap

Subversion

Merging a branch

cd branch_dir
svn log -v --stop-on-copy
cd trunk_dir
svn merge -r min:max branchURL

where min and max are the first and last revision numbers reported from the svn log command, and branchURL is the url (not working copy path) of the branch to merge from

Diff by revision

svn diff -r N:M file

where N and M are the revision numbers to compare

Revert to a previous version of a file

Find revision number you want

svn log filename

Reverse merge, where num is the revision number you want to revert to

svn merge -r HEAD:num filename

Now you can diff and commit (note updating to the revision number doesn't mark the file as changed, so commit doesn't do anything)

Useful links

Migration Literature Review