comparison templates/guide/index.html @ 448:c79d1a115f49

temlpates: update numerous links to wiki
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 23 Mar 2016 13:59:31 +0800
parents 2b0669fed7a8
children 53e90a523b43
comparison
equal deleted inserted replaced
447:9c0c9d2b540b 448:c79d1a115f49
7 <p>With Mercurial you can use a multitude of different workflows. This page shows some of them, including their use cases. It is intended to make it easy for beginners of version tracking to get going instantly and learn completely incrementally. It doesn't explain the concepts used, because there are already many other great resources doing that. </p> 7 <p>With Mercurial you can use a multitude of different workflows. This page shows some of them, including their use cases. It is intended to make it easy for beginners of version tracking to get going instantly and learn completely incrementally. It doesn't explain the concepts used, because there are already many other great resources doing that. </p>
8 8
9 <p>Alternatives to this guide and further reading: </p> 9 <p>Alternatives to this guide and further reading: </p>
10 10
11 <ul> 11 <ul>
12 <li> <a title="Mercurial Tutorial" href="http://www.selenic.com/mercurial/wiki/Tutorial">Tutorial</a> - a more exhaustive tutorial. </li> 12 <li> <a title="Mercurial Tutorial" href="https://www.mercurial-scm.org/wiki/Tutorial">Tutorial</a> - a more exhaustive tutorial. </li>
13 <li><a title="Mercurial: The definitive Guide" href="http://hgbook.red-bean.com/">Mercurial: The Definitive Guide</a> - a very detailed description of Mercurial including <a title="Behind the Scenes" href="http://hgbook.red-bean.com/read/behind-the-scenes.html">behind the scenes</a>, an indepth article on the design of Mercurial.</li> 13 <li><a title="Mercurial: The definitive Guide" href="http://hgbook.red-bean.com/">Mercurial: The Definitive Guide</a> - a very detailed description of Mercurial including <a title="Behind the Scenes" href="http://hgbook.red-bean.com/read/behind-the-scenes.html">behind the scenes</a>, an indepth article on the design of Mercurial.</li>
14 <li><a title="Understanding Mercurial" href="http://www.selenic.com/mercurial/wiki/UnderstandingMercurial">Understanding Mercurial</a> - the concepts behind Mercurial.</li> 14 <li><a title="Understanding Mercurial" href="https://www.mercurial-scm.org/wiki/UnderstandingMercurial">Understanding Mercurial</a> - the concepts behind Mercurial.</li>
15 </ul> 15 </ul>
16 16
17 <div class="note"> 17 <div class="note">
18 <p class="note-title">Note:</p> 18 <p class="note-title">Note:</p>
19 This guide doesn't require any prior knowledge of version control systems (though subversion users will likely feel at home quite quickly). Basic command line abilities are helpful, because we'll use the command line client. <!--If you already know other systems, please check our transition guides: svn, cvs, git, bzr --> 19 This guide doesn't require any prior knowledge of version control systems (though subversion users will likely feel at home quite quickly). Basic command line abilities are helpful, because we'll use the command line client. <!--If you already know other systems, please check our transition guides: svn, cvs, git, bzr -->
760 760
761 <p>But to make use of it, we first need something we can push to.</p> 761 <p>But to make use of it, we first need something we can push to.</p>
762 762
763 <p>By default <em>hg serve</em> doesn't allow pushing, since that would be a major security hole. You can allow pushing in the server, but that's no solution when you live in different timezones, so we'll go with another approach here: Using a shared repository, either on an existing shared server or on a service like <a title="BitBucket" href="http://bitbucket.org">BitBucket</a>. Doing so has a bit higher starting cost and takes a bit longer to explain, but it's well worth the effort spent.</p> 763 <p>By default <em>hg serve</em> doesn't allow pushing, since that would be a major security hole. You can allow pushing in the server, but that's no solution when you live in different timezones, so we'll go with another approach here: Using a shared repository, either on an existing shared server or on a service like <a title="BitBucket" href="http://bitbucket.org">BitBucket</a>. Doing so has a bit higher starting cost and takes a bit longer to explain, but it's well worth the effort spent.</p>
764 764
765 <p>If you want to use an existing shared server, you can use <em>serve</em> there and <a title="How to allow pushing for hg serve" href="http://www.selenic.com/mercurial/wiki/HgWebDirStepByStep#head-746ca383e3a62df34279ec2fca888113497da022">allow pushing</a>. Also there are some other nice ways to <a title="Multiple Committers" href="http://www.selenic.com/mercurial/wiki/MultipleCommitters">allow pushing to a Mercurial repository</a>, including simple <a title="Setting up a shared Mercurial repository using SSH" href="http://www.selenic.com/mercurial/wiki/SharedSSH">access via SSH</a>.</p> 765 <p>If you want to use an existing shared server, you can use <em>serve</em> there and <a title="How to allow pushing for hg serve" href="https://www.mercurial-scm.org/wiki/PublishingRepositories#Allowing_push">allow pushing</a>. Also there are some other nice ways to <a title="Multiple Committers" href="https://www.mercurial-scm.org/wiki/MultipleCommitters">allow pushing to a Mercurial repository</a>, including simple <a title="Setting up a shared Mercurial repository using SSH" href="https://www.mercurial-scm.org/wiki/SharedSSH">access via SSH</a>.</p>
766 766
767 <p>Otherwise you first need to setup a BitBucket Account. Just signup at <a title="BitBucket" href="http://bitbucket.org">BitBucket</a>. After signing up (and login) hover your mouse over "Repositories". There click the item at the bottom of the opening dialog which say "Create new".</p> 767 <p>Otherwise you first need to setup a BitBucket Account. Just signup at <a title="BitBucket" href="http://bitbucket.org">BitBucket</a>. After signing up (and login) hover your mouse over "Repositories". There click the item at the bottom of the opening dialog which say "Create new".</p>
768 768
769 <p>Give it a name and a description. If you want to keep it hidden from the public, select "private"</p> 769 <p>Give it a name and a description. If you want to keep it hidden from the public, select "private"</p>
770 770
1055 A tag must not contain the char ":", since that char is used for specifying multiple revisions - see "hg help revisions". 1055 A tag must not contain the char ":", since that char is used for specifying multiple revisions - see "hg help revisions".
1056 </div> 1056 </div>
1057 1057
1058 <div class="note"> 1058 <div class="note">
1059 <p class="note-title">Note:</p> 1059 <p class="note-title">Note:</p>
1060 To securely mark a revision, you can use the <a title="Using GnuPG to securely sign revisions in Mercurial" href="http://www.selenic.com/mercurial/wiki/GpgExtension">gpg extension</a> to sign the tag. 1060 To securely mark a revision, you can use the <a title="Using GnuPG to securely sign revisions in Mercurial" href="https://www.mercurial-scm.org/wiki/GpgExtension">gpg extension</a> to sign the tag.
1061 </div> 1061 </div>
1062 1062
1063 <h3>Workflow</h3> 1063 <h3>Workflow</h3>
1064 1064
1065 <p>Let's assume you want to give revision 3 the name "v0.1".</p> 1065 <p>Let's assume you want to give revision 3 the name "v0.1".</p>
1089 1089
1090 <h3>Use Case</h3> 1090 <h3>Use Case</h3>
1091 1091
1092 <p>At times you will have changes in your repository, which you really don't want in it.</p> 1092 <p>At times you will have changes in your repository, which you really don't want in it.</p>
1093 1093
1094 <p>There are many advanced options for removing these, and most of them use great extensions (<a title="Mercurial Queues Extension" href="http://www.selenic.com/mercurial/wiki/MqExtension">Mercurial Queues</a> is the most often used one), but in this basic guide, we'll solve the problem with just the commands we already learned. But we'll use an option to clone which we didn't yet need.</p> 1094 <p>There are many advanced options for removing these, and most of them use great extensions (<a title="Mercurial Queues Extension" href="https://www.mercurial-scm.org/wiki/MqExtension">Mercurial Queues</a> is the most often used one), but in this basic guide, we'll solve the problem with just the commands we already learned. But we'll use an option to clone which we didn't yet need.</p>
1095 1095
1096 <p>This workflow becomes inconvenient when you need to remove changes, which are buried below many new changes. If you spot the them early enough, you can <strong>get rid of bad changes</strong> without too much effort, though.</p> 1096 <p>This workflow becomes inconvenient when you need to remove changes, which are buried below many new changes. If you spot the them early enough, you can <strong>get rid of bad changes</strong> without too much effort, though.</p>
1097 1097
1098 <h3>Workflow</h3> 1098 <h3>Workflow</h3>
1099 1099
1140 1140
1141 <p>With this we can conclude our practical guide.</p> 1141 <p>With this we can conclude our practical guide.</p>
1142 1142
1143 <h1 id="complex_workflows">More Complex Workflows</h1> 1143 <h1 id="complex_workflows">More Complex Workflows</h1>
1144 1144
1145 <p>If you now want to check some more complex workflows, please have a look at the general <a title="Mercurial Workflows" href="http://selenic.com/mercurial/wiki/Workflows">workflows wikipage</a> and the list of <a title="Mercurial extensions" href="https://www.mercurial-scm.org/wiki/UsingExtensions">extensions</a>.</p> 1145 <p>If you now want to check some more complex workflows, please have a look at the general <a title="Mercurial Workflows" href="https://www.mercurial-scm.org/wiki/Workflows">workflows wikipage</a> and the list of <a title="Mercurial extensions" href="https://www.mercurial-scm.org/wiki/UsingExtensions">extensions</a>.</p>
1146 1146
1147 <p>To deepen your understanding, you can also check the <a title="Overview of the basic concepts of Mercurial" href="https://www.mercurial-scm.org/wiki/UnderstandingMercurial">basic concept overview</a>.</p> 1147 <p>To deepen your understanding, you can also check the <a title="Overview of the basic concepts of Mercurial" href="https://www.mercurial-scm.org/wiki/UnderstandingMercurial">basic concept overview</a>.</p>
1148 1148
1149 <p>Have fun with Mercurial!</p> 1149 <p>Have fun with Mercurial!</p>
1150 1150