[ 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 [2008/09/19 13:44]
zeman Rolling back versions. 		subversion [2008/12/02 18:48]
bojar info o nekryptovanem prenosu
Line 32: Line 32:
 O přidávání uživatelů a hesel viz níže. O přidávání uživatelů a hesel viz níže.
  
-==== Konfigurace protokolu SVN ====+ 
 +==== Konfigurace protokolu SVN (raději nepoužívat, nekryptovaný přenos) ====
  
 Toto rozhraní je užíváno SVN klienty, kteří dostanou repository udanou ve tvaru ''svn...'', tj. např.: Toto rozhraní je užíváno SVN klienty, kteří dostanou repository udanou ve tvaru ''svn...'', tj. např.:
Line 392: Line 393:
   ~/projects/project   ~/projects/project
 </code> </code>
 +
  
  
Line 417: Line 419:
   * http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.resurrect   * http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.resurrect
   * http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo   * http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo
 +
 +The following code should undo the changes between the revisions 302 and 303 (note the minus sign before 303, meaning negative change) while keeping the other changes between 303 and HEAD.
 +
 +<code>svn merge -c -303 https://svn.ms.mff.cuni.cz/svn/$REPOSITORY/$PROJECT/trunk
 +# alternatively: svn merge -r 303:302 https://svn.ms.mff.cuni.cz/svn/$REPOSITORY/$PROJECT/trunk
 +svn status
 +svn diff
 +svn commit -m "Undoing change committed in r303."</code>
  
 ===== Setting Up an Archive ===== ===== Setting Up an Archive =====

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