User:Chloe

From QERM Wiki
(Difference between revisions)
Jump to: navigation, search
m (Reverted edits by PatrickSeazer (Talk); changed back to last version by Chloe)
(reverting with svn)
Line 18: Line 18:
 
  svn merge -r min:max branchURL
 
  svn merge -r min:max branchURL
  
where min and max are the fisrt and last revision numbers reported from the <code>svn log</code> command, and branchURL is the url (not working copy path) of the branch to merge from
+
where min and max are the first and last revision numbers reported from the <code>svn log</code> command, and branchURL is the url (not working copy path) of the branch to merge from
  
 
=== Diff by revision ===
 
=== Diff by revision ===
Line 25: Line 25:
  
 
where N and M are the revision numbers to compare
 
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 ==
 
== Useful links ==
 
[[Migration Literature Review]]
 
[[Migration Literature Review]]

Revision as of 22:53, 3 December 2010

Contents

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.

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

Personal tools