Mercurial > hgbook

annotate en/examples/branch-named.update-bar.out @ 206:6519f3b983b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More material about named branches.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 23 Apr 2007 15:28:13 -0700
parents
children 2936cb7eae7a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
206
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{hg update bar}
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 $ \textbf{hg update -C bar}
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 1 files updated, 0 files merged, 1 files removed, 0 files unresolved