author | Adrian Buehlmann <adrian@cadifra.com> |
Tue, 24 May 2011 14:08:20 +0200 | |
changeset 14420 | 137b03b5aea1 |
parent 14358 | bf93e78f2638 |
child 15528 | a84698badf0b |
permissions | -rw-r--r-- |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
1 |
$ HGMERGE=true; export HGMERGE |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
2 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
3 |
init |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
4 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
5 |
$ hg init |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
6 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
7 |
commit |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
8 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
9 |
$ echo 'a' > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
10 |
$ hg ci -A -m test -u nobody -d '1 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
11 |
adding a |
4365
46280c004f22
change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3405
diff
changeset
|
12 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
13 |
annotate -c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
14 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
15 |
$ hg annotate -c a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
16 |
8435f90966e4: a |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
17 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
18 |
annotate -cl |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
19 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
20 |
$ hg annotate -cl a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
21 |
8435f90966e4:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
22 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
23 |
annotate -d |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
24 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
25 |
$ hg annotate -d a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
26 |
Thu Jan 01 00:00:01 1970 +0000: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
27 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
28 |
annotate -n |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
29 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
30 |
$ hg annotate -n a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
31 |
0: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
32 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
33 |
annotate -nl |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
34 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
35 |
$ hg annotate -nl a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
36 |
0:1: a |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
37 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
38 |
annotate -u |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
39 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
40 |
$ hg annotate -u a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
41 |
nobody: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
42 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
43 |
annotate -cdnu |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
44 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
45 |
$ hg annotate -cdnu a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
46 |
nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
47 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
48 |
annotate -cdnul |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
49 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
50 |
$ hg annotate -cdnul a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
51 |
nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
52 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
53 |
$ cat <<EOF >>a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
54 |
> a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
55 |
> a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
56 |
> EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
57 |
$ hg ci -ma1 -d '1 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
58 |
$ hg cp a b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
59 |
$ hg ci -mb -d '1 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
60 |
$ cat <<EOF >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
61 |
> b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
62 |
> b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
63 |
> b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
64 |
> EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
65 |
$ hg ci -mb2 -d '2 0' |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
66 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
67 |
annotate -n b |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
68 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
69 |
$ hg annotate -n b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
70 |
0: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
71 |
1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
72 |
1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
73 |
3: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
74 |
3: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
75 |
3: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
76 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
77 |
annotate --no-follow b |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
78 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
79 |
$ hg annotate --no-follow b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
80 |
2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
81 |
2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
82 |
2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
83 |
3: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
84 |
3: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
85 |
3: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
86 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
87 |
annotate -nl b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
88 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
89 |
$ hg annotate -nl b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
90 |
0:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
91 |
1:2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
92 |
1:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
93 |
3:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
94 |
3:5: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
95 |
3:6: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
96 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
97 |
annotate -nf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
98 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
99 |
$ hg annotate -nf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
100 |
0 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
101 |
1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
102 |
1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
103 |
3 b: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
104 |
3 b: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
105 |
3 b: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
106 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
107 |
annotate -nlf b |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
108 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
109 |
$ hg annotate -nlf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
110 |
0 a:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
111 |
1 a:2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
112 |
1 a:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
113 |
3 b:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
114 |
3 b:5: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
115 |
3 b:6: b6 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
116 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
117 |
$ hg up -C 2 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
118 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
119 |
$ cat <<EOF >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
120 |
> b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
121 |
> c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
122 |
> b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
123 |
> EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
124 |
$ hg ci -mb2.1 -d '2 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
125 |
created new head |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
126 |
$ hg merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
127 |
merging b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
128 |
0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
129 |
(branch merge, don't forget to commit) |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
130 |
$ hg ci -mmergeb -d '3 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
131 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
132 |
annotate after merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
133 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
134 |
$ hg annotate -nf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
135 |
0 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
136 |
1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
137 |
1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
138 |
3 b: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
139 |
4 b: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
140 |
3 b: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
141 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
142 |
annotate after merge with -l |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
143 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
144 |
$ hg annotate -nlf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
145 |
0 a:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
146 |
1 a:2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
147 |
1 a:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
148 |
3 b:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
149 |
4 b:5: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
150 |
3 b:5: b5 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
151 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
152 |
$ hg up -C 1 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
153 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
154 |
$ hg cp a b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
155 |
$ cat <<EOF > b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
156 |
> a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
157 |
> z |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
158 |
> a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
159 |
> EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
160 |
$ hg ci -mc -d '3 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
161 |
created new head |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
162 |
$ hg merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
163 |
merging b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
164 |
0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
165 |
(branch merge, don't forget to commit) |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
166 |
$ cat <<EOF >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
167 |
> b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
168 |
> c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
169 |
> b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
170 |
> EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
171 |
$ echo d >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
172 |
$ hg ci -mmerge2 -d '4 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
173 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
174 |
annotate after rename merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
175 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
176 |
$ hg annotate -nf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
177 |
0 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
178 |
6 b: z |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
179 |
1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
180 |
3 b: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
181 |
4 b: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
182 |
3 b: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
183 |
7 b: d |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
184 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
185 |
annotate after rename merge with -l |
3405
2e1d8b238b6c
Test annotate using named rev instead of linkrev
Brendan Cully <brendan@kublai.com>
parents:
3202
diff
changeset
|
186 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
187 |
$ hg annotate -nlf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
188 |
0 a:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
189 |
6 b:2: z |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
190 |
1 a:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
191 |
3 b:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
192 |
4 b:5: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
193 |
3 b:5: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
194 |
7 b:7: d |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
195 |
|
14358
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
196 |
Issue2807: alignment of line numbers with -l |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
197 |
|
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
198 |
$ echo more >> b |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
199 |
$ hg ci -mmore -d '5 0' |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
200 |
$ echo more >> b |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
201 |
$ hg ci -mmore -d '6 0' |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
202 |
$ echo more >> b |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
203 |
$ hg ci -mmore -d '7 0' |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
204 |
$ hg annotate -nlf b |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
205 |
0 a: 1: a |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
206 |
6 b: 2: z |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
207 |
1 a: 3: a |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
208 |
3 b: 4: b4 |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
209 |
4 b: 5: c |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
210 |
3 b: 5: b5 |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
211 |
7 b: 7: d |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
212 |
8 b: 8: more |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
213 |
9 b: 9: more |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
214 |
10 b:10: more |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
215 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
216 |
linkrev vs rev |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
217 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
218 |
$ hg annotate -r tip -n a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
219 |
0: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
220 |
1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
221 |
1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
222 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
223 |
linkrev vs rev with -l |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
224 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
225 |
$ hg annotate -r tip -nl a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
226 |
0:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
227 |
1:2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
228 |
1:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
229 |
|
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
11852
diff
changeset
|
230 |
Issue589: "undelete" sequence leads to crash |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
231 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
232 |
annotate was crashing when trying to --follow something |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
233 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
234 |
like A -> B -> A |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
235 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
236 |
generate ABA rename configuration |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
237 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
238 |
$ echo foo > foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
239 |
$ hg add foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
240 |
$ hg ci -m addfoo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
241 |
$ hg rename foo bar |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
242 |
$ hg ci -m renamefoo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
243 |
$ hg rename bar foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
244 |
$ hg ci -m renamebar |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
245 |
|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
246 |
annotate after ABA with follow |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
247 |
|
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
248 |
$ hg annotate --follow foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
249 |
foo: foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
250 |
|
13697
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
251 |
missing file |
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
252 |
|
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
253 |
$ hg ann nosuchfile |
14358
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
254 |
abort: nosuchfile: no such file in rev e9e6b4fa872f |
13697
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
255 |
[255] |