Mercurial - Revision history

Scott: /* Cheat Sheet */

2016-01-29T16:57:28Z

Cheat Sheet

← Older revision		Revision as of 16:57, 29 January 2016
Line 4:		Line 4:
	You are currently on version 38 but want to revert to version 33:		You are currently on version 38 but want to revert to version 33:
	<pre>		<pre>
	hg log # to see logs of all versions		hg log # to see logs of all versions
	hg update -r 33 # to revert to version 33		hg update -r 33 # to revert to version 33
	hg update -r 38 # to revert back to version 38		hg update -r 38 # to revert back to version 38
			hg cat -r 22 old_file.txt # output version 22 of a specific file
	</pre>		</pre>

2016-01-05T21:49:07Z

Dealing with conflicts

← Older revision		Revision as of 21:49, 5 January 2016
Line 108:		Line 108:
	You also probably want to get rid of <code>my_file.txt.orig</code>. Then commit and push the harmonized head back to the server.		You also probably want to get rid of <code>my_file.txt.orig</code>. Then commit and push the harmonized head back to the server.

	Workflow:		=== Workflow ===
	# If you haven’t done so in a while, get the latest version that everyone else is working off of:		# If you haven’t done so in a while, get the latest version that everyone else is working off of:
	#* hg pull		#* hg pull

2016-01-05T21:46:06Z

To deal with unmergeable conflicts

← Older revision		Revision as of 21:46, 5 January 2016
Line 98:		Line 98:
	</pre>		</pre>

	=== ~~To deal~~ with ~~unmergeable~~ conflicts ===		=== Dealing with conflicts ===

	https://www.mercurial-scm.org/wiki/TutorialConflict		https://www.mercurial-scm.org/wiki/TutorialConflict

2016-01-05T21:43:36Z

Working with a server

@@ Line 97: / Line 97: @@
 hg heads              # show any changesets that are at the head of the repository
 </pre>
 Workflow:

2015-11-16T23:24:37Z

Creating accounts

← Older revision		Revision as of 23:24, 16 November 2015
Line 170:		Line 170:
	<pre>		<pre>
	dev@mybox:~$ ssh-keygen -t ecdsa -b 521 # add a passphrase		dev@mybox:~$ ssh-keygen -t ecdsa -b 521 # add a passphrase
			# OR #
			dev@mybox:~$ ssh-keygen -t ed25519 -a 31 # add a passphrase
	</pre>		</pre>
	* send a copy of the public key to <code>luser@myserver</code>		* send a copy of the public key to <code>luser@myserver</code>

2015-03-06T17:31:04Z

Backing up mercurial-server

← Older revision		Revision as of 17:31, 6 March 2015
Line 188:		Line 188:

	==== Backing up <code>mercurial-server</code> ====		==== Backing up <code>mercurial-server</code> ====
	* Repositories are stored in <code>/var/lib/mercurial-server</code>.		* Repositories are stored in <code>/var/lib/mercurial-server/repos</code>.
	* Keys are stored in <code>/etc/mercurial-server/keys</code>.		* Keys are stored in <code>/etc/mercurial-server/keys</code>.

2015-03-06T17:30:00Z

SSH-based Server

← Older revision		Revision as of 17:30, 6 March 2015
Line 177:		Line 177:
	</pre>		</pre>
	NOTE: this creates a regular user who can only check code in and out. To set up a <code>root</code> user with the authority to create and delete repositories, change <code>users</code> to <code>root</code> in the public key path above.		NOTE: this creates a regular user who can only check code in and out. To set up a <code>root</code> user with the authority to create and delete repositories, change <code>users</code> to <code>root</code> in the public key path above.

	~~==== Backing up <code>mercurial-server</code> ====~~
	* Repositories are stored in <code>/var/lib/mercurial-server</code>.
	* Keys are stored in <code>/etc/mercurial-server/keys</code>.

	==== Uploading a repository to the server ====		==== Uploading a repository to the server ====
Line 190:		Line 186:
	hg pull ssh://hg@myserver/my/project		hg pull ssh://hg@myserver/my/project
	</pre>		</pre>

			==== Backing up <code>mercurial-server</code> ====
			* Repositories are stored in <code>/var/lib/mercurial-server</code>.
			* Keys are stored in <code>/etc/mercurial-server/keys</code>.

2015-03-06T17:29:27Z

Creating accounts

← Older revision		Revision as of 17:29, 6 March 2015
Line 172:		Line 172:
	</pre>		</pre>
	* send a copy of the public key to <code>luser@myserver</code>		* send a copy of the public key to <code>luser@myserver</code>
	* as <code>root@myserver</code>, copy the public key to a file named <code>/etc/mercurial-server/keys/~~root~~/dev/mybox</code> and run this command:		* as <code>root@myserver</code>, copy the public key to a file named <code>/etc/mercurial-server/keys/users/dev/mybox</code> and run this command:
	<pre>		<pre>
	root@myserver:# sudo -u hg /usr/share/mercurial-server/refresh-auth		root@myserver:# sudo -u hg /usr/share/mercurial-server/refresh-auth
	</pre>		</pre>
	NOTE: this creates a <code>root</code> user with the authority to create and delete repositories~~. To set up a regular user who can only check code in and out~~, change <code>~~root~~</code> to <code>~~users~~</code> in the public key path above.		NOTE: this creates a regular user who can only check code in and out. To set up a <code>root</code> user with the authority to create and delete repositories, change <code>users</code> to <code>root</code> in the public key path above.

			==== Backing up <code>mercurial-server</code> ====
			* Repositories are stored in <code>/var/lib/mercurial-server</code>.
			* Keys are stored in <code>/etc/mercurial-server/keys</code>.

	==== Uploading a repository to the server ====		==== Uploading a repository to the server ====

2015-02-23T23:18:29Z

Cheat Sheet

← Older revision		Revision as of 23:18, 23 February 2015
Line 6:		Line 6:
	hg log # to see logs of all versions		hg log # to see logs of all versions
	hg update -r 33 # to revert to version 33		hg update -r 33 # to revert to version 33
			hg update -r 38 # to revert back to version 38
	</pre>		</pre>

2015-02-23T23:17:46Z

← Older revision		Revision as of 23:17, 23 February 2015
Line 1:		Line 1:
	{{lowercase title}}		{{lowercase title}}

			== Cheat Sheet ==
			You are currently on version 38 but want to revert to version 33:
			<pre>
			hg log # to see logs of all versions
			hg update -r 33 # to revert to version 33
			</pre>

	== Client ==		== Client ==