Mercurial > hgbook

annotate ja/examples/branch-named.update-bar.out @ 784:386cdca52f0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
a bit more tour-basic.tex
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Wed, 03 Jun 2009 19:12:11 +0900
parents b0db5adf11c1
children
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