[ Skip to the content ]

Institute of Formal and Applied Linguistics Wiki

[ Back to the navigation ]

You are here: start » subversion

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 		Previous revision
Next revision Both sides next revision
subversion [2007/10/08 12:21]
zeman Přeuspořádání. 		subversion [2008/06/16 21:06]
zeman Corrected messed up formatting caused by migration from MediaWiki.
Line 353: Line 353:
  
 This command takes the differences between the alopez branch from rev. 250 to 271, and applies them to the working copy.  Note that this may create conflicts!  (To preview these, I can use the ''--dry-run'' flag to ''svn merge'').  Once I've successfully resolved any conflicts, merged the files, and run regression tests as described above, I can commit the files to the development trunk. This command takes the differences between the alopez branch from rev. 250 to 271, and applies them to the working copy.  Note that this may create conflicts!  (To preview these, I can use the ''--dry-run'' flag to ''svn merge'').  Once I've successfully resolved any conflicts, merged the files, and run regression tests as described above, I can commit the files to the development trunk.
 +
  
 ===== Tags ===== ===== Tags =====
Line 373: Line 374:
 </code> </code>
  
-=== [[VersionControlTags|Current Tags and Branches]] === +===== Rolling Back Versions =====
- +
-=== Rolling Back Versions ===+
  
 What do you do if something is broken that wasn't broken before?  You can simply check out a copy of the file (or the entire project) from a point before the problem arose.  In order to see the revisions in which a particular file changed, you can run What do you do if something is broken that wasn't broken before?  You can simply check out a copy of the file (or the entire project) from a point before the problem arose.  In order to see the revisions in which a particular file changed, you can run
Line 389: Line 388:
 ''svn update &lt;file&gt; -r &lt;revision&gt;'' ''svn update &lt;file&gt; -r &lt;revision&gt;''
  
-=== Setting Up an Archive ===+===== Setting Up an Archive =====
  
 You can use svn to keep track of your own code.  Let's say you want to archive the directory ''/nfshomes/$USER/proj'' and all its subdirectories.  You can do so with the following commands. You can use svn to keep track of your own code.  Let's say you want to archive the directory ''/nfshomes/$USER/proj'' and all its subdirectories.  You can do so with the following commands.
Line 414: Line 413:
 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 =====
  
 You can accomplish virtually anything you can imagine with the repository, although it may not be immediately obvious how.  For instance: You can accomplish virtually anything you can imagine with the repository, although it may not be immediately obvious how.  For instance:
  
-: $ Get the latest revision number of your current branch (wine cluster only).: ''svn info -r HEAD''  +  * Get the latest revision number of your current branch: ''svn info -r HEAD''. You can also try ''svn log | head -2'' 
-:You can also try ''svn log | head -2'' +  * 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 the logs of all changes to your current branch since you last updated.: ''svn log -r HEAD:BASE'' +  * 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: ''<nowiki>svn merge -r 475:474 file:///fs/clip-mteval/svn/Programs/branches/bittorrent .</nowiki>''
-: $ 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 .'' +
- +
-: $ 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 .'' +
- +
  
-=== Troubleshooting ===+===== Troubleshooting =====
  
 If you get the message: If you get the message:
Line 448: Line 441:
 * pray * pray
  
-=== Further Reading ===+===== Further Reading =====
  
 All of the information in this tutorial comes directly from the online [http://svnbook.red-bean.com/ Subversion book].  It is not necessary to read the entire book to get a good idea of how subversion works.  In general, if you only have a limited period of time in which to get acquainted, you will get the most mileage out of the following parts of the book: All of the information in this tutorial comes directly from the online [http://svnbook.red-bean.com/ Subversion book].  It is not necessary to read the entire book to get a good idea of how subversion works.  In general, if you only have a limited period of time in which to get acquainted, you will get the most mileage out of the following parts of the book:

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