Mercurial tutorial - Revision history

DaFox: Removed link to SVN tutorial

2010-06-27T04:36:29Z

Removed link to SVN tutorial

DS: /* Workflow */

2009-12-18T10:12:48Z

‎Workflow

DS: /* Push and Pull Locations */

2009-12-18T10:12:09Z

‎Push and Pull Locations

DS: /* AlliedModders */

2009-12-18T08:47:07Z

‎AlliedModders

BAILOPAN at 06:08, 23 September 2008

2008-09-23T06:08:57Z

BAILOPAN at 06:08, 23 September 2008

2008-09-23T06:08:18Z

BAILOPAN at 06:06, 23 September 2008

2008-09-23T06:06:05Z

DS: Added sections that were inadvertantly removed - thanks mediawiki

2008-09-15T07:34:47Z

Added sections that were inadvertantly removed - thanks mediawiki

DS: Removed duplicate section again, wtf

2008-09-15T07:23:52Z

Removed duplicate section again, wtf

DS: /* AlliedModders */

2008-09-15T07:23:13Z

‎AlliedModders

← Older revision		Revision as of 04:36, 27 June 2010
Line 1:		Line 1:
−	Mercurial (Hg) is a distributed version control system. While it has similarities with ~~[[Subversion Tutorial\|~~Subverison]], it is decentralized in nature.	+	Mercurial (Hg) is a distributed version control system. While it has similarities with Subverison, it is decentralized in nature.

	=Getting Started=		=Getting Started=

@@ Line 111: / Line 111: @@
 Now you edit B.cpp and commit again.  You're done for the day, and you have two changesets sitting in your repository.  You want to push these upstream.  For example:
-<pre>hg push ssh://dvander@alliedmods.net//hg/sourcemod-central
+<pre>hg push ssh://dvander@alliedmods.net@hg.alliedmods.net/sourcemod-central
 searching for changes
 adding changesets

@@ Line 73: / Line 73: @@
 [paths]
 default = http://hg.alliedmods.net/sourcemod-central
-default-push = ssh://dvander@hg.alliedmods.net//hg/sourcemod-central
+default-push = ssh://dvander@alliedmods.net@hg.alliedmods.net/sourcemod-central
 </pre>
-'''Note''': Mercurial uses double slashes to specify an absolute file-system path.  If you are using SSH with logical paths, you only need one slash.  For more information about this, visit the Mercurial documentation.  AlliedModders uses absolute paths.
+'''Note''': Mercurial uses double slashes to specify an absolute file-system path.  If you are using SSH with logical paths, you only need one slash.  For more information about this, visit the Mercurial documentation.  AlliedModders uses logical paths.
 ==Changesets==

@@ Line 230: / Line 230: @@
 AlliedModders has a public Mercurial listing at [http://hg.alliedmods.net/ http://hg.alliedmods.net/].
-Anyone can clone or pull from these.  Only developers with SSH access can push.  Developers should use the following URL formula for pushing: <pre>ssh://USERNAME@hg.alliedmods.net//hg/PROJECT</pre>
+Anyone can clone or pull from these.  Only developers with SSH access can push.  Developers should use the following URL formula for pushing: <pre>ssh://EMAIL@hg.alliedmods.net/PROJECT</pre>
-You should use SSH keys for security.  You should also use the "Firstname Lastname &lt;email&gt;" authorship style.  It is a good idea to configure this ahead of time (read the configuration section above).
+SSH keys are required for security.  You should also use the "Firstname Lastname &lt;email&gt;" authorship style.  It is a good idea to configure this ahead of time (read the configuration section above).
 It is also highly recommended that long commit messages be split with a short summary on the first line and details on further lines. (See the note at the bottom of the Workflow section above.)
 Note that unlike Subversion, you cannot checkout a folder within a repository.  This is by design.
 =External Links=

@@ Line 32: / Line 32: @@
 <pre>hg clone http://hg.alliedmods.net/sourcemod-central sourcemod-central</pre>
-You can clone a repository from any location -- locally, or a remote version.
+You can clone a repository from any location, even locally.
 <pre>
 hg clone sourcemod-central sourcemod-copy
 </pre>

← Older revision		Revision as of 07:34, 15 September 2008
Line 200:		Line 200:

	If you want to use and configure a merge program, see [http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram MergeProgram] at the Mercurial docs. Though it's not listed, you can also use [http://www.scootersoftware.com/ Beyond Compare] (the author's personal choice).		If you want to use and configure a merge program, see [http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram MergeProgram] at the Mercurial docs. Though it's not listed, you can also use [http://www.scootersoftware.com/ Beyond Compare] (the author's personal choice).
		+
		+
		+	=Other Commands=
		+	<tt>hg diff</tt> is very useful for reviewing changes before you commit them. You can also use it for generating patches.
		+
		+	<tt>hg log</tt> lets you view the changeset history.
		+
		+	<tt>hg glog</tt> lets you view an ASCII graph of the changeset history.
		+
		+	<tt>hg identity</tt> tells you the state of your repository.
		+
		+	<tt>hg status</tt> shows you any changed or unknown files.
		+
		+	<tt>hg status -m</tt> shows you any changed files.
		+
		+	<tt>hg revert</tt> will remove any changes you've made to one or more files. It will save the originals as the same file name with <tt>.orig</tt> at the end.
		+
		+	For many commands you can specify a folder within the repository to only affect that folder and its children. This can speed up slow operations.
		+
		+
		+	=SSH Authentication=
		+	If you are accessing your repository via SSH using the <tt>ssh</tt> protocol, entering your password is annoying and could be a security risk. You should look into using [[SSH_Keys\|SSH Keys]] (full instructions are provided).

← Older revision		Revision as of 07:23, 15 September 2008
Line 210:		Line 210:

	It is also highly recommended that long commit messages be split with a short summary on the first line and details on further lines. (See the note at the bottom of the Workflow section above.)		It is also highly recommended that long commit messages be split with a short summary on the first line and details on further lines. (See the note at the bottom of the Workflow section above.)
−
−	~~Note that unlike Subversion, you cannot checkout a folder within a repository. This is by design.~~
−
−	~~=AlliedModders=~~
−	~~AlliedModders has a public Mercurial listing at [http://hg.alliedmods.net/ http://hg.alliedmods.net/].~~
−
−	~~Anyone can clone or pull from these. Only developers with SSH access can push. Developers should use the following URL formula for pushing: <pre>ssh://USERNAME@hg.alliedmods.net//hg/PROJECT</pre>~~
−
−	You should use SSH keys for security. You should also use the "Firstname Lastname <email>" authorship style. It is a good idea to configure this ahead of time (read the configuration section above).
−
−	~~It is highly recommended that long commit messages be split with a short summary on the first line and details on further lines. (See the note at the bottom of the Workflow section above.)~~

	Note that unlike Subversion, you cannot checkout a folder within a repository. This is by design.		Note that unlike Subversion, you cannot checkout a folder within a repository. This is by design.

@@ Line 202: / Line 202: @@
-=Other Commands=
+=AlliedModders=
-<tt>hg diff</tt> is very useful for reviewing changes before you commit them.  You can also use it for generating patches.
+AlliedModders has a public Mercurial listing at [http://hg.alliedmods.net/ http://hg.alliedmods.net/].
-<tt>hg log</tt> lets you view the changeset history.
+Anyone can clone or pull from these.  Only developers with SSH access can push.  Developers should use the following URL formula for pushing: <pre>ssh://USERNAME@hg.alliedmods.net//hg/PROJECT</pre>
-<tt>hg glog</tt> lets you view an ASCII graph of the changeset history.
+You should use SSH keys for security.  You should also use the "Firstname Lastname &lt;email&gt;" authorship style.  It is a good idea to configure this ahead of time (read the configuration section above).
-<tt>hg identity</tt> tells you the state of your repository.
+It is also highly recommended that long commit messages be split with a short summary on the first line and details on further lines. (See the note at the bottom of the Workflow section above.)
 =AlliedModders=