User Tools

Site Tools


difx:subversion

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Last revision Both sides next revision
difx:subversion [2017/03/22 11:36]
chrisphillips
difx:subversion [2019/09/12 10:46]
chrisphillips [Subversion]
Line 15: Line 15:
  
 === Merge changes from trunk onto a branch === === Merge changes from trunk onto a branch ===
 +
 +//Note this may be easier on Subversion 1.5 and newer //
  
   * Find the revision in which the branch was created:   * Find the revision in which the branch was created:
Line 46: Line 48:
 <​code>​ <​code>​
 > svn merge -r 4029:4152 ^/​mpifxcorr/​trunk > svn merge -r 4029:4152 ^/​mpifxcorr/​trunk
 +</​code>​
 +
 +With newer versions of subversion, you can just do something like (from a clean copy of branch):
 +
 +<​code>​
 +> svn merge  ../../trunk
 </​code>​ </​code>​
  
difx/subversion.txt · Last modified: 2019/09/12 10:47 by chrisphillips