Mercurial > hgbook

view 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
line wrap: on
line source

<screen><prompt>$</prompt> <userinput>cd ../main</userinput>
<prompt>$</prompt> <userinput>hg pull ../stable</userinput>
pulling from ../stable
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
<prompt>$</prompt> <userinput>hg merge</userinput>
merging myfile
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
<prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput>
<prompt>$</prompt> <userinput>cat myfile</userinput>
This is a fix to a boring feature.
This is exciting and new!
</screen>