Mercurial > hgbook

diff en/examples/branch-repo @ 199:58e3a6c76725

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More branch/merge stuff.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 16 Apr 2007 17:37:27 -0700
parents 615f3c6b30e1
children
line wrap: on
line diff
--- a/en/examples/branch-repo	Mon Apr 16 17:21:38 2007 -0700
+++ b/en/examples/branch-repo	Mon Apr 16 17:37:27 2007 -0700
@@ -30,6 +30,19 @@
 cd ..
 hg clone myproject my-feature
 cd my-feature
-echo "I'm adding a new feature with my mind!" > mynewfile
+echo 'This sure is an exciting new feature!' > mynewfile
 hg commit -A -m 'New feature'
+hg push
 
+#$ name: pull
+
+cd ..
+hg clone myproject myproject-merge
+cd myproject-merge
+hg pull ../myproject-1.0.1
+
+#$ name: merge
+
+hg merge
+hg commit -m 'Merge bugfix from 1.0.1 branch'
+hg push