Commits

php  committed 4605503 Merge

Merge with Arne

  • Participants
  • Parent commits c8c147c, 0fec47d

Comments (0)

Files changed (1)

File guide/index.html

 
 </pre>
 
+<p>To see the active branches with <em>hg branches</em>. To mark a branch as inactive, for example because you finished implementing the feature, you can close it. Closed branches are hidden in <em>hg branches</em> as well as in <em>hg heads</em>.</pre>
+
+<pre>$ hg update feature1
+$ hg commit --close-branch -m "finished feature1"
+
+</pre>
+
 <p>And that's it. Now you can easily keep features separate without unnecessary bookkeeping.</p>
 
 <div class="note">
 
 <p>At times you will have changes in your repository, which you really don't want in it.</p>
 
-<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 use.</p>
+<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>
 
 <p>This workflow becomes inconvenient when you need to remove changes, which are buried below many new changes. If you spot the bad changes early enough, you can get rid of them without too much effort, though.</p>