Using Mercurial - Revision history

Dirk: you can now use hg.geeklog.net instead of cvs.geeklog.net

2012-05-14T19:02:19Z

you can now use hg.geeklog.net instead of cvs.geeklog.net

Dirk: Mercurial on the server updated to 1.5.1

2010-04-28T17:57:07Z

Mercurial on the server updated to 1.5.1

Dirk: added a link to hginit.com

2010-03-15T09:15:46Z

added a link to hginit.com

Dirk: link to another Mercurial introduction

2010-03-06T19:43:38Z

link to another Mercurial introduction

Dirk: Fixed link to Mercurial homepage

2010-02-10T09:12:15Z

Fixed link to Mercurial homepage

Dirk: link to Coding Guidelines section about correct line endings

2010-01-30T19:59:53Z

link to Coding Guidelines section about correct line endings

Dirk: link to a more extensive explanation of merging

2010-01-16T16:19:06Z

link to a more extensive explanation of merging

Dirk: link to Merge vs. Rebase article

2009-07-05T08:46:23Z

link to Merge vs. Rebase article

Dirk: forbidcrlf also works in the global .hgrc - much easier

2009-05-31T16:58:09Z

forbidcrlf also works in the global .hgrc - much easier

Dirk: how to prevent accidental commits with CR+LF line endings

2009-05-31T16:53:53Z

how to prevent accidental commits with CR+LF line endings

@@ Line 33: / Line 33: @@
 === SSH Setup ===
-For ssh access, you need an [[Setting up an account on cvs.geeklog.net|account]] on the server. So this is only of interest for the core developers and SoC students.
+For ssh access, you need an [[Setting up an account on hg.geeklog.net|account]] on the server. So this is only of interest for the core developers and SoC students.
 You can clone the repository via SSH like so:
-<pre>hg clone ssh://username@cvs.geeklog.net//cvsroot/hg/geeklog geeklog</pre>
+<pre>hg clone ssh://username@hg.geeklog.net//cvsroot/hg/geeklog geeklog</pre>
 Where "username" is your login name and the "geeklog" at the end of the command line is again simply a name for your local directory.
-Please note the slightly odd path syntax with the two slashes after <tt>cvs.geeklog.net</tt> - those are required.
+Please note the slightly odd path syntax with the two slashes after <tt>hg.geeklog.net</tt> - those are required.
@@ Line 48: / Line 48: @@
 Being able to push changes back to the repository again requires an account on the server. You can either do
-<pre>hg push ssh://username@cvs.geeklog.net//cvsroot/hg/geeklog</pre>
+<pre>hg push ssh://username@hg.geeklog.net//cvsroot/hg/geeklog</pre>
 or, to make your life easier, set the <tt>default-push</tt> repository in the <tt>.hg/hgrc</tt> file of your local repository like so:
 <pre>[paths]
-default-push = ssh://username@cvs.geeklog.net//cvsroot/hg/geeklog</pre>
+default-push = ssh://username@hg.geeklog.net//cvsroot/hg/geeklog</pre>
 (Again, in the ssh: URLs above, replace "username" with your login name)
@@ Line 61: / Line 61: @@
 Changes pushed back into the central repository will trigger an email sent to the geeklog-cvs mailing list. However, that email will only be sent after the following additional steps:
-# log into your account on cvs.geeklog.net
+# log into your account on hg.geeklog.net
 # in your home directory, create a file named <tt>.hgrc</tt>
 # enter this as the file's content:
@@ Line 86: / Line 86: @@
 If you attempt to push changes to the main repository and receive the error:
-  pushing to ssh://username@cvs.geeklog.net//cvsroot/geeklog/Geeklog-SoC
+  pushing to ssh://username@hg.geeklog.net//cvsroot/geeklog/Geeklog-SoC
   searching for changes
   abort: push creates new remote heads!
@@ Line 162: / Line 162: @@
 <pre>[paths]
-default = ssh://[your username]@cvs.geeklog.net//cvsroot/hg/geeklog
+default = ssh://[your username]@hg.geeklog.net//cvsroot/hg/geeklog
 </pre>
@@ Line 176: / Line 176: @@
 * Commit will just commit the change to your local repository
 * Use the synchronize (Tortoise client term) to push the local committed changes up to the remote repository
-* When doing the synchronize, in the pop-up dialog, the remote path is: ssh://username@cvs.geeklog.net//cvsroot/hg/geeklog
+* When doing the synchronize, in the pop-up dialog, the remote path is: ssh://username@hg.geeklog.net//cvsroot/hg/geeklog
 So I develop in geeklog-hg-dev, then I winmerge my changes back into geeklog-hg-mine to make sure I never accidentally commit local settings (paths etc) or hacks, debugs. Then I commit to geeklog-hg-mine, then back to geeklog-hg when that's ready, then push up to master. Complex hey? ;-)

← Older revision		Revision as of 17:57, 28 April 2010
Line 12:		Line 12:
	Installation instructions are provided for [http://www.selenic.com/mercurial/wiki/index.cgi/WindowsInstall Windows], [http://www.selenic.com/mercurial/wiki/index.cgi/UnixInstall Mac OS X], and [http://www.selenic.com/mercurial/wiki/index.cgi/UnixInstall Linux]		Installation instructions are provided for [http://www.selenic.com/mercurial/wiki/index.cgi/WindowsInstall Windows], [http://www.selenic.com/mercurial/wiki/index.cgi/UnixInstall Mac OS X], and [http://www.selenic.com/mercurial/wiki/index.cgi/UnixInstall Linux]

−	On the server, we are currently using '''Mercurial 1.2.1'''. While Mercurial is pretty good at being both backward and forward compatible, we recommend that you use the same version locally.	+	On the server, we are currently using '''Mercurial 1.5.1'''. While Mercurial is pretty good at being both backward and forward compatible, we recommend that you use the same version locally.

@@ Line 123: / Line 123: @@
 * The [http://www.selenic.com/mercurial/wiki/ Mercurial Wiki] is a good place to search for more information.
 * [http://www.lunch.org.uk/wiki/articles Inside a distributed version control system] by Jim Hague provides a good introduction into the workings of DVCS in general and Mercurial in particular.
 * Another good introduction: [http://bpse.ifs.tuwien.ac.at/technology/tech-scm-mercurial.html Technology: Sourcecode Management (SCM)]
 * Mercurial lets you choose between a variety of workflows. [http://hg-scm.org/workflow_guide Learning Mercurial in Workflows] discusses the most commonly used ones.

@@ Line 123: / Line 123: @@
 * The [http://www.selenic.com/mercurial/wiki/ Mercurial Wiki] is a good place to search for more information.
 * [http://www.lunch.org.uk/wiki/articles Inside a distributed version control system] by Jim Hague provides a good introduction into the workings of DVCS in general and Mercurial in particular.
 * Mercurial lets you choose between a variety of workflows. [http://hg-scm.org/workflow_guide Learning Mercurial in Workflows] discusses the most commonly used ones.
 * Those already familiar with a non-distributed VCS may find [[Mercurial for SVN Users]] useful.

@@ Line 1: / Line 1: @@
 == Introduction ==
-[http://www.selenic.com/mercurial/ Mercurial] is a distributed version control system (DVCS). The differences to a "traditional" centralized VCS (like CVS or Subversion) include:
+[http://mercurial.selenic.com/ Mercurial] is a distributed version control system (DVCS). The differences to a "traditional" centralized VCS (like CVS or Subversion) include:
 * Users get a self-contained repository that they can commit changes to, even when being offline.

@@ Line 180: / Line 180: @@
 == Windows vs. Unix Line Endings ==
-Per convention, all of Geeklog's source files should use Unix-like line endings (LF only). Windows users please make sure that you configure your editor to write Unix-style line endings (instead of the Windows-style CR+LF line endings).
+[[Coding Guidelines#File_Formats|Per convention]], all of Geeklog's source files should use Unix-like line endings (LF only). Windows users please make sure that you configure your editor to write Unix-style line endings (instead of the Windows-style CR+LF line endings).
 To prevent accidentally committing a file with Windows line endings, you can add the following snippet to your global <tt>.hgrc</tt> or <tt>mercurial.ini</tt> file:

← Older revision		Revision as of 16:19, 16 January 2010
Line 93:		Line 93:

	Also: Don't try to push newly added files while you still have uncommited changes lying around (or you will end up with the above). In that case, it may make sense to make a fresh clone (fast + cheap if you use an "incoming" repository!), add the new files there, then push from the fresh copy.		Also: Don't try to push newly added files while you still have uncommited changes lying around (or you will end up with the above). In that case, it may make sense to make a fresh clone (fast + cheap if you use an "incoming" repository!), add the new files there, then push from the fresh copy.
		+
		+	More information: [[Merging a Feature Branch]]

	=== Username ===		=== Username ===

@@ Line 178: / Line 178: @@
 Per convention, all of Geeklog's source files should use Unix-like line endings (LF only). Windows users please make sure that you configure your editor to write Unix-style line endings (instead of the Windows-style CR+LF line endings).
-To prevent accidentally committing a file with Windows line endings, you can add the following snippet to the <tt>.hg/hgrc</tt> file of all the repositories that you are committing against:
+To prevent accidentally committing a file with Windows line endings, you can add the following snippet to your global <tt>.hgrc</tt> or <tt>mercurial.ini</tt> file:
 <pre>[hooks]