hgbook

view en/examples/branching.merge.out @ 281:a880d07f2d29

find changesets by author, revision, files, or words in the commit message
Fix repository paths of data/index files in filelog diagram.

Data/index files are stored in the repository at .hg/store/data, not .hg/data.
Modify the filelog diagram to reflect this.
author Arun Thomas <arun.thomas@gmail.com>
date Mon Dec 17 23:16:59 2007 -0500 (2007-12-17)
parents
children
line source
1 $ \textbf{cd ../main}
2 $ \textbf{hg pull ../stable}
3 pulling from ../stable
4 searching for changes
5 adding changesets
6 adding manifests
7 adding file changes
8 added 1 changesets with 1 changes to 1 files (+1 heads)
9 (run 'hg heads' to see heads, 'hg merge' to merge)
10 $ \textbf{hg merge}
11 merging myfile
12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
13 (branch merge, don't forget to commit)
14 $ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
15 $ \textbf{cat myfile}
16 This is a fix to a boring feature.
17 This is exciting and new!