hgbook: en/examples/branch-repo.pull.out annotate

annotate en/examples/branch-repo.pull.out @ 371:3f9f9b087109

more collab.tex

author	Yoshiki Yazawa <yaz@honeyplanet.jp>
date	Mon, 08 Dec 2008 12:30:31 +0900
parents	58e3a6c76725
children	2b8c6aa370d5

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}
58e3a6c76725 More branch/merge stuff. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	3 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	4 $ \textbf{cd myproject-merge}
58e3a6c76725 More branch/merge stuff. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	5 $ \textbf{hg pull ../myproject-1.0.1}
58e3a6c76725 More branch/merge stuff. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	6 pulling from ../myproject-1.0.1
58e3a6c76725 More branch/merge stuff. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	7 searching for changes
58e3a6c76725 More branch/merge stuff. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	8 adding changesets
58e3a6c76725 More branch/merge stuff. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	9 adding manifests
58e3a6c76725 More branch/merge stuff. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	10 adding file changes
58e3a6c76725 More branch/merge stuff. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	11 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	12 (run 'hg heads' to see heads, 'hg merge' to merge)