SVN Glossary - Revision history

Testacct: test edit; just fixing a typo

2009-12-22T01:52:44Z

test edit; just fixing a typo

← Older revision		Revision as of 01:52, 22 December 2009
Line 13:		Line 13:

	== Branch ==		== Branch ==
	A [[#Repository\|repository]] can contain several branches. There is always one main branch, called the '''trunk'''. The names are already indicating that the branch structure is a bit like a tree, or like arms of a large ~~rivers~~. The trunk can be considered as the mainstream. It is always possible to create a new branch based on a specific revision (one speaks of ''branching off'').		A [[#Repository\|repository]] can contain several branches. There is always one main branch, called the '''trunk'''. The names are already indicating that the branch structure is a bit like a tree, or like arms of a large river. The trunk can be considered as the mainstream. It is always possible to create a new branch based on a specific revision (one speaks of ''branching off'').

	The branches are usually stored in a different URL, e.g.		The branches are usually stored in a different URL, e.g.

Greebo at 12:06, 26 November 2007

2007-11-26T12:06:23Z

@@ Line 11: / Line 11: @@
 == Blame ==
 This applies to text-based files only. The blame option let's you see which line in a text file has been changed by whom and when. Especially useful for sourcecode files, when you want to find out when a specific line has been altered the last time.
 == Checkout ==
@@ Line 19: / Line 34: @@
 Note: Committing files does '''not''' update your local copy, you'll have to do that manually.
 == Conflict ==
@@ Line 64: / Line 80: @@
 For browsing the revisions, see also [[#History|History]], [[#Repository Browser|Repository Browser]] and [[#Update|Update]].
 == Update ==

Greebo: /* Update */

2007-11-26T11:18:23Z

Update

← Older revision		Revision as of 11:18, 26 November 2007
Line 67:		Line 67:
	== Update ==		== Update ==
	Updating a local copy means synchronising it with the server. Choosing update will download all changes since the last time you updated your copy (files added by other users, text changes made to files, file deletions). The process will update your working copy to the [[#HEAD\|HEAD]] [[#Revision\|revision]] by default, but you can manually choose to update to a certain [[#Revision\|revision]] if you wish.		Updating a local copy means synchronising it with the server. Choosing update will download all changes since the last time you updated your copy (files added by other users, text changes made to files, file deletions). The process will update your working copy to the [[#HEAD\|HEAD]] [[#Revision\|revision]] by default, but you can manually choose to update to a certain [[#Revision\|revision]] if you wish.

			During update, the SVN software will also try to merge changes into locally modified files (imagine both you and another user made changes to the same material file). If the changes can be automatically resolved, SVN will do so, otherwise a [[#Conflict\|conflict]] occurs, which has to be manually resolved.

	{{tutorial-SVN}}		{{tutorial-SVN}}

Greebo at 11:15, 26 November 2007

2007-11-26T11:15:35Z

@@ Line 1: / Line 1: @@
 The SVN terminology can be confusing at times, this is a (probably incomplete) list of terms explained: __noTOC__
-== Repository ==
+== Add ==
-The SVN repository is the "master container" containing all the files of a project, including all their [[#History|history]] and other [[#Branch|branches]]. An SVN Server can contain multiple repositories (e.g. our DarkMod SVN server holds the repositories darkmod, darkmod_src, texture_src, etc.). For downloading a repository, see [[#Checkout|Checkout]].
+Just moving new files into your local folder doesn't do anything, you also have to '''add''' them (in Tortoise, use right-click '''SVN -> Add'''). Adding files ''will only mark the files'' as candidates for the next commit, the actual upload to the SVN Server takes place the next time you [[#Commit|commit]] your changes.
 == Checkout ==
 Downloading a copy of a SVN Repository to a location on your hard disk is called a '''checkout'''. A checkout is the initial download of a working copy, not to be confused with an [[#Update|Update]]. You checkout a working copy ''once'', but you can update it multiple times.
 == Commit ==
@@ Line 13: / Line 19: @@
 Note: Committing files does '''not''' update your local copy, you'll have to do that manually.
 == Revision ==
@@ Line 23: / Line 65: @@
 For browsing the revisions, see also [[#History|History]], [[#Repository Browser|Repository Browser]] and [[#Update|Update]].
-== HEAD ==
+== Update ==
-The HEAD revision is a synonym for the most recent revision (= the revision carrying the highest number).
+Updating a local copy means synchronising it with the server. Choosing update will download all changes since the last time you updated your copy (files added by other users, text changes made to files, file deletions). The process will update your working copy to the [[#HEAD|HEAD]] [[#Revision|revision]] by default, but you can manually choose to update to a certain [[#Revision|revision]] if you wish.
 {{tutorial-SVN}}

Greebo at 10:32, 26 November 2007

2007-11-26T10:32:59Z

← Older revision		Revision as of 10:32, 26 November 2007
Line 26:		Line 26:
	The HEAD revision is a synonym for the most recent revision (= the revision carrying the highest number).		The HEAD revision is a synonym for the most recent revision (= the revision carrying the highest number).

	{{~~tutorials~~-SVN}}		{{tutorial-SVN}}

Greebo at 10:32, 26 November 2007

2007-11-26T10:32:44Z

← Older revision		Revision as of 10:32, 26 November 2007
Line 1:		Line 1:
	The SVN terminology can be confusing at times, this is a (probably incomplete) list of terms explained:		The SVN terminology can be confusing at times, this is a (probably incomplete) list of terms explained: __noTOC__

	__noTOC__

	== Repository ==		== Repository ==
	The SVN repository is the "master container" containing all the files of a project, including all their [[#History\|history]] and other [[#Branch\|branches]]. An SVN Server can contain multiple repositories (e.g. our DarkMod SVN server holds the repositories darkmod, darkmod_src, texture_src, etc.). For downloading a repository, see [[#Checkout\|Checkout]].		The SVN repository is the "master container" containing all the files of a project, including all their [[#History\|history]] and other [[#Branch\|branches]]. An SVN Server can contain multiple repositories (e.g. our DarkMod SVN server holds the repositories darkmod, darkmod_src, texture_src, etc.). For downloading a repository, see [[#Checkout\|Checkout]].
Line 18:		Line 15:

	== Revision ==		== Revision ==
			Each time somebody performs a [[#Commit\|commit]], the revision number of the repository is increased by one. It doesn't matter how many files you commit, or if the changes are minor, or if a file gets added or deleted - no matter what you commit, the revision number is always increased. The most recent revision is called the HEAD revision.

			The advantage of having revisions is that you can go back to a specific point in the SVN history by specifying the revision number. For code changes this is especially useful: a bug in the software might be discovered now, but it may have been introduced long ago. By stepping back the revisions you can (more or less easily) find out when exactly the bug was introduced, which lines of code have been changed (see [[#Diff\|Diff]]) and by whom (see also [[#Blame\|Blame]]).

			The revision system affects all files, also [[#Binary\|binary]] files like textures and Lightwave models, for instance.

			For browsing the revisions, see also [[#History\|History]], [[#Repository Browser\|Repository Browser]] and [[#Update\|Update]].

	== HEAD ==		== HEAD ==
			The HEAD revision is a synonym for the most recent revision (= the revision carrying the highest number).

	{{tutorials-SVN}}		{{tutorials-SVN}}

Greebo at 10:24, 26 November 2007

2007-11-26T10:24:13Z

← Older revision		Revision as of 10:24, 26 November 2007
Line 1:		Line 1:
	The SVN terminology can be confusing at times, this is a (probably incomplete) list of terms explained:		The SVN terminology can be confusing at times, this is a (probably incomplete) list of terms explained:

			__noTOC__

	== Repository ==		== Repository ==
	The SVN repository is the "master container" containing all the files of a project, including all their [[#History\|history]] and other [[#Branch\|branches]]. An SVN Server can contain multiple repositories (e.g. our DarkMod SVN server holds the repositories darkmod, darkmod_src, texture_src, etc.). For downloading a repository, see [[#Checkout\|Checkout]].		The SVN repository is the "master container" containing all the files of a project, including all their [[#History\|history]] and other [[#Branch\|branches]]. An SVN Server can contain multiple repositories (e.g. our DarkMod SVN server holds the repositories darkmod, darkmod_src, texture_src, etc.). For downloading a repository, see [[#Checkout\|Checkout]].

Greebo: moved glossary to separate article

2007-11-26T10:23:23Z

moved glossary to separate article

New page

The SVN terminology can be confusing at times, this is a (probably incomplete) list of terms explained:
== Repository ==
The SVN repository is the "master container" containing all the files of a project, including all their [[#History|history]] and other [[#Branch|branches]]. An SVN Server can contain multiple repositories (e.g. our DarkMod SVN server holds the repositories darkmod, darkmod_src, texture_src, etc.). For downloading a repository, see [[#Checkout|Checkout]].

== Checkout ==
Downloading a copy of a SVN Repository to a location on your hard disk is called a '''checkout'''. A checkout is the initial download of a working copy, not to be confused with an [[#Update|Update]]. You checkout a working copy ''once'', but you can update it multiple times.

== Update ==
Updating a local copy means synchronising it with the server. Choosing update will download all changes since the last time you updated your copy (files added by other users, text changes made to files, file deletions). The process will update your working copy to the [[#HEAD|HEAD]] [[#Revision|revision]] by default, but you can manually choose to update to a certain [[#Revision|revision]] if you wish.

== Commit ==
Just changing your local files isn't enough to "store" them in the server, you have to '''commit''' them. You need write access to the [[#Repository|repository]] to be able to commit stuff. It is perfectly thinkable that the files you're about to commit have already been altered by another user. In the case of text/ascii files, the SVN Server tries to [[#merge|merge]] your changes into the files. If it fails (or if the files are not in text format ([[#Binary|binary]]), the merge will fail and you run into a [[#Conflict|conflict]].

Note: Committing files does '''not''' update your local copy, you'll have to do that manually.

== Revision ==

== HEAD ==

{{tutorials-SVN}}