Mercurial > hgbook

comparison 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
comparison
equal deleted inserted replaced
198:615f3c6b30e1 199:58e3a6c76725
28 #$ name: new 28 #$ name: new
29 29
30 cd .. 30 cd ..
31 hg clone myproject my-feature 31 hg clone myproject my-feature
32 cd my-feature 32 cd my-feature
33 echo "I'm adding a new feature with my mind!" > mynewfile 33 echo 'This sure is an exciting new feature!' > mynewfile
34 hg commit -A -m 'New feature' 34 hg commit -A -m 'New feature'
35 hg push
35 36
37 #$ name: pull
38
39 cd ..
40 hg clone myproject myproject-merge
41 cd myproject-merge
42 hg pull ../myproject-1.0.1
43
44 #$ name: merge
45
46 hg merge
47 hg commit -m 'Merge bugfix from 1.0.1 branch'
48 hg push