Changes between Version 25 and Version 26 of code/tools/SVN

Timestamp:

Nov 25, 2008, 2:36:15 PM (16 years ago)

Author:

bknecht

Comment:

—

code/tools/SVN

@@ -89 +89 @@
 <hr style="margin:0px;">
 <br/>
-<h3 style="margin:0;">update (up)</h3>
+<h3 style="margin:0;" id="update">update (up)</h3>
 }}}
 Update is closely related to checkout, as it also download - or updates - the svn tree. while checkout is normally only used once, update is used all the time. 
@@ -110 +110 @@
 <hr style="margin:0px;">
 <br/>
-<h3 style="margin:0;">commit (ci)</h3>
+<h3 style="margin:0;" id="commit">commit (ci)</h3>
 }}}
 Sometimes also called checkin, does the opposite of checkout or update, it upload changes made to the local copy to the server. 
@@ -121 +121 @@
 }}}
 
-A commit is only possible if the local version is up-to-date. If it isn't you will get an error, and the commit will fail. The solution then is to do an [wiki:SVN#updateup update].
-{{{
-#!html
-<hr style="margin:0px;">
-<br/>
-<h3 style="margin:0;">add</h3>
+A commit is only possible if the local version is up-to-date. If it isn't you will get an error, and the commit will fail. The solution then is to do an [wiki:SVN#update update].
+{{{
+#!html
+<hr style="margin:0px;">
+<br/>
+<h3 style="margin:0;" id="add">add</h3>
 }}}
 Adding a new file to the local svn copy, that it gets uploaded with the next commit. 
@@ -141 +141 @@
 <hr style="margin:0px;">
 <br/>
-<h3 style="margin:0;">remove (rm)</h3>
+<h3 style="margin:0;" id="remove">remove (rm)</h3>
 }}}
 Also called delete (del), which deletes an item from the svn tree. Please note that this also removes the file/folder from the local harddrive. 
@@ -155 +155 @@
 <hr style="margin:0px;">
 <br/>
-<h3 style="margin:0;">move (mv)</h3>
+<h3 style="margin:0;" id="move">move (mv)</h3>
 }}}
 Sometimes called rename (ren) - as a rename is the same as a move. The command simplifies the rearranging of files in the svn tree. 
@@ -174 +174 @@
 <hr style="margin:0px;">
 <br/>
-<h3 style="margin:0;">copy (cp)</h3>
+<h3 style="margin:0;" id="copy">copy (cp)</h3>
 }}}
 A command which is rarely used on the local tree - why would someone need a file twice in the same tree? - but it is rather useful to create new branches. Though it is normally done by the supervisors, it can be done by the students.
@@ -188 +188 @@
 <hr style="margin:0px;">
 <br/>
-<h3 style="margin:0;">resolved</h3>
+<h3 style="margin:0;" id="resolved">resolved</h3>
 }}}
 If a conflict arises - this normally happens if someone changes a file on the server (committed it) while you were doing changes in the same place. This command '''does not solve''' the conflict, but it removes the other unnecessary files.
@@ -202 +202 @@
 <hr style="margin:0px;">
 <br/>
-<h3 style="margin:0;">revert</h3>
+<h3 style="margin:0;" id="revert">revert</h3>
 }}}
 One of the major advantages of a version control system, is that you can always revert to a known saved state - in this case the last updated local revision. Revert removes all local changes and restores the file to a state prior editing, i.e discarding all local changes.
@@ -216 +216 @@
 <hr style="margin:0px;">
 <br/>
-<h3 style="margin:0;">diff (di)</h3>
+<h3 style="margin:0;" id="diff">diff (di)</h3>
 }}}
 Another rarely used but very useful command. It shows the difference between the downloaded revision and the current state, which basically what will be uploaded at the next commit. It is also useful to check if all new files have been added to the svn tree - it happens very often, that there are two commits in short time, first the updates, then the new files. 
@@ -230 +230 @@
 <hr style="margin:0px;">
 <br/>
-<h3 style="margin:0;">merge</h3>
+<h3 style="margin:0;" id="merge">merge</h3>
 }}}