Mercurial > hgbook
annotate en/examples/issue29.go.out @ 525:e5739e8d708f
finished file "concepts.tex". Upgraded project status file
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Sun, 23 Nov 2008 13:22:45 -0500 |
parents | 43bfadf9b760 |
children |
rev | line source |
---|---|
156
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 $ \textbf{hg init issue29} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 $ \textbf{cd issue29} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 $ \textbf{echo a > a} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 $ \textbf{hg ci -Ama} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 adding a |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 $ \textbf{echo b > b} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 $ \textbf{hg ci -Amb} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 adding b |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 $ \textbf{hg up 0} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 $ \textbf{mkdir b} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 $ \textbf{echo b > b/b} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 $ \textbf{hg ci -Amc} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 adding b/b |
394
43bfadf9b760
Fixed sample output for 'issue29' test.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents:
156
diff
changeset
|
15 created new head |
156
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 $ \textbf{hg merge} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 |