User:Chloe

From QERM Wiki
(Difference between revisions)
Jump to: navigation, search
(Java)
(Merging a branch)
Line 1: Line 1:
 
== Subversion ==
 
== 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 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
 
  
 
=== Diff by revision ===
 
=== Diff by revision ===

Revision as of 08:37, 25 October 2010

Subversion

Diff by revision

svn diff -r N:M file

where N and M are the revision numbers to compare

Useful links

Migration Literature Review

Personal tools