--- a/content/blog/2009/08/a-guide-to-branching-in-mercurial.html Fri Dec 25 18:57:49 2009 -0500
+++ b/content/blog/2009/08/a-guide-to-branching-in-mercurial.html Fri Dec 25 19:44:34 2009 -0500
@@ -47,7 +47,7 @@
Before I start explaining the different branching models, here's a simple
repository I'll use as an example:
-
+
The repository is in the `~/src/test-project` folder. It has three changesets
in it: numbers 0, 1 and 2.
@@ -84,7 +84,7 @@
one and push/pull changesets between them as often as you like. Once you've
made some changes in each one, the result might look like this:
-
+
We've got two copies of the repository. Both contain the changesets that
existed at the time we branched/cloned. If we push from `test-project` into
@@ -194,11 +194,14 @@
branch. When you commit, it will move the bookmark to the newly created
changeset.
-**Note:** for more detailed information on actually using bookmarks day-to-day please read the [bookmarks page][bookmark]. This guide is meant to show the different branching models, and bookmarks have a few quirks that you should know about if you're going to use them.
+**Note:** for more detailed information on actually using bookmarks day-to-day
+please read the [bookmarks page][bookmark]. This guide is meant to show the
+different branching models, and bookmarks have a few quirks that you should
+know about if you're going to use them.
Here's what the repository would look like with this method:
-
+
The diagram of the changesets is pretty simple: the branch point was at
changeset 2 and each branch has one new changeset on it.
@@ -260,7 +263,7 @@
Here's what a repository using named branches might look like:
-
+
An important difference with this method is that the branch name is
permanently recorded as part of the changeset's metadata (as you can see in
@@ -317,7 +320,7 @@
The result of updating and committing without doing anything else would be:
-
+
How do you switch back and forth between branches once you do this? Just use
`hg update --check REV` with the revision number (or hash) (you can shorten
@@ -367,7 +370,8 @@
There's one more *big* difference between Mercurial's branching and git's
branching:
-**Mercurial will push/pull *all* branches by default, while git will push/pull only the *current* branch.**
+**Mercurial will push/pull *all* branches by default, while git will push/pull
+only the *current* branch.**
This is important if you're a git user working with Mercurial. If you want to
push/pull only a single branch with Mercurial you can use the `--rev` option
--- a/layout/skeleton/_base.html Fri Dec 25 18:57:49 2009 -0500
+++ b/layout/skeleton/_base.html Fri Dec 25 19:44:34 2009 -0500
@@ -51,7 +51,11 @@
</div>
<div id="content">
- {% block content %}{% endblock %}
+ {% with page.node.ancestors|last as parent_node %}
+ {% with parent_node.url as parent_url %}
+ {% block content %}{% endblock %}
+ {% endwith %}
+ {% endwith %}
</div>
</div>
</body>
