Mercurial > hgbook

comparison en/examples/results/branching.merge.out @ 663:0d5935744f87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch from LaTeX to XML for examples.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 21:39:23 -0700
parents 44d1363234d2
children 4432ad34b8e5
comparison
equal deleted inserted replaced
662:44d1363234d2 663:0d5935744f87
1 $ \textbf{cd ../main} 1 <screen><prompt>$</prompt> <userinput>cd ../main</userinput>
2 $ \textbf{hg pull ../stable} 2 <prompt>$</prompt> <userinput>hg pull ../stable</userinput>
3 pulling from ../stable 3 pulling from ../stable
4 searching for changes 4 searching for changes
5 adding changesets 5 adding changesets
6 adding manifests 6 adding manifests
7 adding file changes 7 adding file changes
8 added 1 changesets with 1 changes to 1 files (+1 heads) 8 added 1 changesets with 1 changes to 1 files (+1 heads)
9 (run 'hg heads' to see heads, 'hg merge' to merge) 9 (run 'hg heads' to see heads, 'hg merge' to merge)
10 $ \textbf{hg merge} 10 <prompt>$</prompt> <userinput>hg merge</userinput>
11 merging myfile 11 merging myfile
12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
13 (branch merge, don't forget to commit) 13 (branch merge, don't forget to commit)
14 $ \textbf{hg commit -m 'Bring in bugfix from stable branch'} 14 <prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput>
15 $ \textbf{cat myfile} 15 <prompt>$</prompt> <userinput>cat myfile</userinput>
16 This is a fix to a boring feature. 16 This is a fix to a boring feature.
17 This is exciting and new! 17 This is exciting and new!
18 </screen>