Mercurial > hgbook

view en/examples/branching.merge.out @ 533:c847605eb2a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
translated a bit, will stop translating this file until I figure out how to translate the expression "case sensitivity"
author jerojasro@localhost
date Mon, 01 Dec 2008 20:56:29 -0500
parents 5fc4a45c069f
children
line wrap: on
line source

$ \textbf{cd ../main}
$ \textbf{hg pull ../stable}
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)
$ \textbf{hg merge}
merging myfile
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
$ \textbf{cat myfile}
This is a fix to a boring feature.
This is exciting and new!