Mercurial > hgbook

annotate en/examples/branch-repo.pull.out @ 397:2b8c6aa370d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix sample output for test 'branch-repo'.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 21:54:18 +0200
parents 58e3a6c76725
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
199
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{cd ..}
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 $ \textbf{hg clone myproject myproject-merge}
397
2b8c6aa370d5 Fix sample output for test 'branch-repo'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 199
diff changeset
3 updating working directory
199
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 $ \textbf{cd myproject-merge}
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 $ \textbf{hg pull ../myproject-1.0.1}
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 pulling from ../myproject-1.0.1
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 searching for changes
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 adding changesets
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 adding manifests
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 adding file changes
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 added 1 changesets with 1 changes to 1 files (+1 heads)
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 (run 'hg heads' to see heads, 'hg merge' to merge)