[ Skip to the content ]

Institute of Formal and Applied Linguistics Wiki


[ Back to the navigation ]

Differences

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

Link to this comparison view

Both sides previous revision Previous revision
Next revision Both sides next revision
subversion [2008/06/16 21:03]
zeman Corrected messed up formatting caused by migration from MediaWiki.
subversion [2008/06/16 21:06]
zeman Corrected messed up formatting caused by migration from MediaWiki.
Line 412: Line 412:
  
 See [[VersionControlSetup|VersionControlSetup]] for the series of commands used to set up the MTEval archive. See [[VersionControlSetup|VersionControlSetup]] for the series of commands used to set up the MTEval archive.
 +
  
 ===== Stupid Repository Tricks ===== ===== Stupid Repository Tricks =====
Line 420: Line 421:
   * View the logs of all changes to your current branch since you last updated: ''svn log -r HEAD:BASE''   * View the logs of all changes to your current branch since you last updated: ''svn log -r HEAD:BASE''
   * View all the differences between your working copy and the latest revision of your current branch: ''svn diff -r HEAD .''   * View all the differences between your working copy and the latest revision of your current branch: ''svn diff -r HEAD .''
-  * Merge into your current working copy the bug fixes checked in to r475 of the bittorrent branch (even if that's not your working branch): ''svn merge -r 474:475 file:///fs/clip-mteval/svn/Programs/branches/bittorrent .'' +  * Merge into your current working copy the bug fixes checked in to r475 of the bittorrent branch (even if that's not your working branch): ''<nowiki>svn merge -r 474:475 file:///fs/clip-mteval/svn/Programs/branches/bittorrent .</nowiki>'' 
-  * Change your mind when you realize those bug fixes did more harm than good: ''svn merge -r 475:474 file:///fs/clip-mteval/svn/Programs/branches/bittorrent .''+  * Change your mind when you realize those bug fixes did more harm than good: ''<nowiki>svn merge -r 475:474 file:///fs/clip-mteval/svn/Programs/branches/bittorrent .</nowiki>''
  
 ===== Troubleshooting ===== ===== Troubleshooting =====

[ Back to the navigation ] [ Back to the content ]