annotate en/examples/branch-named.update-switchy.out @ 427:b7d284121f21

merge from somewhere else
author jerojasro@localhost
date Thu, 16 Oct 2008 23:25:41 -0500
parents 6519f3b983b4
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 foo}
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 $ \textbf{hg parents}
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 changeset:
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 branch: foo
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 user: Bryan O'Sullivan <bos@serpentine.com>
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 summary: Second commit
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 $ \textbf{hg update bar}
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 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
12 $ \textbf{hg parents}
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 changeset:
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14 branch: bar
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 tag: tip
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16 user: Bryan O'Sullivan <bos@serpentine.com>
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
17
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
18 summary: Third commit
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
19