Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-annotate.out @ 5344:cc34be74eeec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 29 Sep 2007 21:10:54 -0700
parents 2192001e4bb4
children
comparison
equal deleted inserted replaced
5343:26692d08c2f9 5344:cc34be74eeec
1 % init 1 % init
2 % commit 2 % commit
3 adding a 3 adding a
4 % annotate -c 4 % annotate -c
5 8435f90966e4: a 5 8435f90966e4: a
6 % annotate -cl
7 8435f90966e4:1: a
6 % annotate -d 8 % annotate -d
7 Thu Jan 01 00:00:01 1970 +0000: a 9 Thu Jan 01 00:00:01 1970 +0000: a
8 % annotate -n 10 % annotate -n
9 0: a 11 0: a
12 % annotate -nl
13 0:1: a
10 % annotate -u 14 % annotate -u
11 nobody: a 15 nobody: a
12 % annotate -cdnu 16 % annotate -cdnu
13 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a 17 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a
14 % annotate b 18 % annotate -cdnul
19 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a
20 % annotate -n b
15 2: a 21 2: a
16 2: a 22 2: a
17 2: a 23 2: a
18 3: b 24 3: b4
19 3: b 25 3: b5
20 3: b 26 3: b6
27 % annotate -nl b
28 2:1: a
29 2:2: a
30 2:3: a
31 3:4: b4
32 3:5: b5
33 3:6: b6
21 % annotate -nf b 34 % annotate -nf b
22 0 a: a 35 0 a: a
23 1 a: a 36 1 a: a
24 1 a: a 37 1 a: a
25 3 b: b 38 3 b: b4
26 3 b: b 39 3 b: b5
27 3 b: b 40 3 b: b6
41 % annotate -nlf b
42 0 a:1: a
43 1 a:2: a
44 1 a:3: a
45 3 b:4: b4
46 3 b:5: b5
47 3 b:6: b6
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 merging b 49 merging b
30 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 50 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
31 (branch merge, don't forget to commit) 51 (branch merge, don't forget to commit)
32 % annotate after merge 52 % annotate after merge
33 0 a: a 53 0 a: a
34 1 a: a 54 1 a: a
35 1 a: a 55 1 a: a
36 3 b: b 56 3 b: b4
37 4 b: c 57 4 b: c
38 3 b: b 58 3 b: b5
59 % annotate after merge with -l
60 0 a:1: a
61 1 a:2: a
62 1 a:3: a
63 3 b:4: b4
64 4 b:5: c
65 3 b:5: b5
39 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 66 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
40 merging b 67 merging b
41 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 68 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
42 (branch merge, don't forget to commit) 69 (branch merge, don't forget to commit)
43 % annotate after rename merge 70 % annotate after rename merge
44 0 a: a 71 0 a: a
45 6 b: z 72 6 b: z
46 1 a: a 73 1 a: a
47 3 b: b 74 3 b: b4
48 4 b: c 75 4 b: c
49 3 b: b 76 3 b: b5
50 7 b: d 77 7 b: d
78 % annotate after rename merge with -l
79 0 a:1: a
80 6 b:2: z
81 1 a:3: a
82 3 b:4: b4
83 4 b:5: c
84 3 b:5: b5
85 7 b:7: d
51 % linkrev vs rev 86 % linkrev vs rev
52 0: a 87 0: a
53 1: a 88 1: a
54 1: a 89 1: a
90 % linkrev vs rev with -l
91 0:1: a
92 1:2: a
93 1:3: a
55 % generate ABA rename configuration 94 % generate ABA rename configuration
56 % annotate after ABA with follow 95 % annotate after ABA with follow
57 foo: foo 96 foo: foo