hgbook
annotate ja/examples/branching.merge.out @ 1114:527b86d55d4a
inotify: update installation information
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sun Dec 13 16:35:56 2009 +0900 (2009-12-13) |
parents | |
children |
rev | line source |
---|---|
foozy@708 | 1 $ \textbf{cd ../main} |
foozy@708 | 2 $ \textbf{hg pull ../stable} |
foozy@708 | 3 pulling from ../stable |
foozy@708 | 4 searching for changes |
foozy@708 | 5 adding changesets |
foozy@708 | 6 adding manifests |
foozy@708 | 7 adding file changes |
foozy@708 | 8 added 1 changesets with 1 changes to 1 files (+1 heads) |
foozy@708 | 9 (run 'hg heads' to see heads, 'hg merge' to merge) |
foozy@708 | 10 $ \textbf{hg merge} |
foozy@708 | 11 merging myfile |
foozy@708 | 12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
foozy@708 | 13 (branch merge, don't forget to commit) |
foozy@708 | 14 $ \textbf{hg commit -m 'Bring in bugfix from stable branch'} |
foozy@708 | 15 $ \textbf{cat myfile} |
foozy@708 | 16 This is a fix to a boring feature. |
foozy@708 | 17 This is exciting and new! |