Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-annotate.out @ 3165:5c93dd0ae413

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor annotate copy support.
author Brendan Cully <brendan@kublai.com>
date Wed, 27 Sep 2006 09:10:21 -0700
parents cd47230a4eb9
children 2e1d8b238b6c
comparison
equal deleted inserted replaced
3164:706277866251 3165:5c93dd0ae413
9 0: a 9 0: a
10 % annotate -u 10 % annotate -u
11 nobody: a 11 nobody: a
12 % annotate -cdnu 12 % annotate -cdnu
13 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a 13 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a
14 % annotate b
15 2: a
16 2: a
17 2: a
18 3: b
19 3: b
20 3: b
21 % annotate -nf b
22 0 a: a
23 1 a: a
24 1 a: a
25 3 b: b
26 3 b: b
27 3 b: b
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 merging b
30 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
31 (branch merge, don't forget to commit)
32 % annotate after merge
33 0 a: a
34 1 a: a
35 1 a: a
36 3 b: b
37 4 b: c
38 3 b: b
39 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
40 merging b
41 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
42 (branch merge, don't forget to commit)
43 % annotate after rename merge
44 0 a: a
45 6 b: z
46 1 a: a
47 3 b: b
48 4 b: c
49 3 b: b
50 7 b: d