Mercurial > hgbook

annotate en/examples/branch-named.merge.out @ 499:f89ee6f63ea2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Archivo to Fichero and update Leame.1st
author Igor TAmara <igor@tamarapatino.org>
date Thu, 06 Nov 2008 23:09:47 -0500
parents 2936cb7eae7a
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 branch}
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 bar
398
2936cb7eae7a Fix sample output for test 'branch-named'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 206
diff changeset
3 $ \textbf{hg merge foo}
206
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 (branch merge, don't forget to commit)
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 $ \textbf{hg commit -m 'Merge'}
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 $ \textbf{hg tip}
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 changeset:
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 branch: bar
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 tag: tip
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 parent:
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 parent:
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 user: Bryan O'Sullivan <bos@serpentine.com>
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 summary: Merge
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16