equal
deleted
inserted
replaced
10 hg ci -A -m test -u nobody -d '1 0' |
10 hg ci -A -m test -u nobody -d '1 0' |
11 |
11 |
12 echo % annotate -c |
12 echo % annotate -c |
13 hg annotate -c a |
13 hg annotate -c a |
14 |
14 |
|
15 echo % annotate -cl |
|
16 hg annotate -cl a |
|
17 |
15 echo % annotate -d |
18 echo % annotate -d |
16 hg annotate -d a |
19 hg annotate -d a |
17 |
20 |
18 echo % annotate -n |
21 echo % annotate -n |
19 hg annotate -n a |
22 hg annotate -n a |
20 |
23 |
|
24 echo % annotate -nl |
|
25 hg annotate -nl a |
|
26 |
21 echo % annotate -u |
27 echo % annotate -u |
22 hg annotate -u a |
28 hg annotate -u a |
23 |
29 |
24 echo % annotate -cdnu |
30 echo % annotate -cdnu |
25 hg annotate -cdnu a |
31 hg annotate -cdnu a |
|
32 |
|
33 echo % annotate -cdnul |
|
34 hg annotate -cdnul a |
26 |
35 |
27 cat <<EOF >>a |
36 cat <<EOF >>a |
28 a |
37 a |
29 a |
38 a |
30 EOF |
39 EOF |
31 hg ci -ma1 -d '1 0' |
40 hg ci -ma1 -d '1 0' |
32 hg cp a b |
41 hg cp a b |
33 hg ci -mb -d '1 0' |
42 hg ci -mb -d '1 0' |
34 cat <<EOF >> b |
43 cat <<EOF >> b |
35 b |
44 b4 |
36 b |
45 b5 |
37 b |
46 b6 |
38 EOF |
47 EOF |
39 hg ci -mb2 -d '2 0' |
48 hg ci -mb2 -d '2 0' |
40 |
49 |
41 echo % annotate b |
50 echo % annotate -n b |
42 hg annotate b |
51 hg annotate -n b |
|
52 echo % annotate -nl b |
|
53 hg annotate -nl b |
43 echo % annotate -nf b |
54 echo % annotate -nf b |
44 hg annotate -nf b |
55 hg annotate -nf b |
|
56 echo % annotate -nlf b |
|
57 hg annotate -nlf b |
45 |
58 |
46 hg up -C 2 |
59 hg up -C 2 |
47 cat <<EOF >> b |
60 cat <<EOF >> b |
48 b |
61 b4 |
49 c |
62 c |
50 b |
63 b5 |
51 EOF |
64 EOF |
52 hg ci -mb2.1 -d '2 0' |
65 hg ci -mb2.1 -d '2 0' |
53 hg merge |
66 hg merge |
54 hg ci -mmergeb -d '3 0' |
67 hg ci -mmergeb -d '3 0' |
55 echo % annotate after merge |
68 echo % annotate after merge |
56 hg annotate -nf b |
69 hg annotate -nf b |
|
70 echo % annotate after merge with -l |
|
71 hg annotate -nlf b |
57 |
72 |
58 hg up -C 1 |
73 hg up -C 1 |
59 hg cp a b |
74 hg cp a b |
60 cat <<EOF > b |
75 cat <<EOF > b |
61 a |
76 a |
63 a |
78 a |
64 EOF |
79 EOF |
65 hg ci -mc -d '3 0' |
80 hg ci -mc -d '3 0' |
66 hg merge |
81 hg merge |
67 cat <<EOF >> b |
82 cat <<EOF >> b |
68 b |
83 b4 |
69 c |
84 c |
70 b |
85 b5 |
71 EOF |
86 EOF |
72 echo d >> b |
87 echo d >> b |
73 hg ci -mmerge2 -d '4 0' |
88 hg ci -mmerge2 -d '4 0' |
74 echo % annotate after rename merge |
89 echo % annotate after rename merge |
75 hg annotate -nf b |
90 hg annotate -nf b |
|
91 echo % annotate after rename merge with -l |
|
92 hg annotate -nlf b |
76 |
93 |
77 echo % linkrev vs rev |
94 echo % linkrev vs rev |
78 hg annotate -r tip a |
95 hg annotate -r tip -n a |
|
96 echo % linkrev vs rev with -l |
|
97 hg annotate -r tip -nl a |
79 |
98 |
80 # test issue 589 |
99 # test issue 589 |
81 # annotate was crashing when trying to --follow something |
100 # annotate was crashing when trying to --follow something |
82 # like A -> B -> A |
101 # like A -> B -> A |
83 echo % generate ABA rename configuration |
102 echo % generate ABA rename configuration |