view en/examples/branch-repo.pull.out @ 199:58e3a6c76725

More branch/merge stuff.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 16 Apr 2007 17:37:27 -0700
parents
children 2b8c6aa370d5
line wrap: on
line source

$ \textbf{cd ..}
$ \textbf{hg clone myproject myproject-merge}
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ \textbf{cd myproject-merge}
$ \textbf{hg pull ../myproject-1.0.1}
pulling from ../myproject-1.0.1
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)