Mercurial > hgbook

annotate ja/examples/rename.divergent.merge.out @ 776:019040fbf5f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged to upstream: phase 1
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Tue, 21 Apr 2009 00:36:40 +0900
parents b0db5adf11c1
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
156
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 # See http://www.selenic.com/mercurial/bts/issue455
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 $ \textbf{cd ../orig}
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 $ \textbf{hg pull -u ../anne}
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 pulling from ../anne
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 searching for changes
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 adding changesets
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 adding manifests
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 adding file changes
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 added 1 changesets with 1 changes to 1 files
228
50223e198614 Update output.
Bryan O'Sullivan <bos@serpentine.com>
parents: 193
diff changeset
10 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
156
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 $ \textbf{hg pull ../bob}
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 pulling from ../bob
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 searching for changes
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14 adding changesets
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 adding manifests
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16 adding file changes
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
17 added 1 changesets with 1 changes to 1 files (+1 heads)
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
18 (run 'hg heads' to see heads, 'hg merge' to merge)
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
19 $ \textbf{hg merge}
273
00f69e8825c5 Bring book up to date with recent changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 228
diff changeset
20 warning: detected divergent renames of foo to:
00f69e8825c5 Bring book up to date with recent changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 228
diff changeset
21 bar
00f69e8825c5 Bring book up to date with recent changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 228
diff changeset
22 quux
156
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
24 (branch merge, don't forget to commit)
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
25 $ \textbf{ls}
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
26 bar quux