Show More
@@ -1,175 +1,177 | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | hg init a |
|
4 | 4 | cd a |
|
5 | 5 | echo a > a |
|
6 | 6 | hg add a |
|
7 | 7 | echo line 1 > b |
|
8 | 8 | echo line 2 >> b |
|
9 | 9 | hg commit -l b -d '1000000 0' -u 'User Name <user@hostname>' |
|
10 | 10 | hg add b |
|
11 | 11 | echo other 1 > c |
|
12 | 12 | echo other 2 >> c |
|
13 | 13 | echo >> c |
|
14 | 14 | echo other 3 >> c |
|
15 | 15 | hg commit -l c -d '1100000 0' -u 'A. N. Other <other@place>' |
|
16 | 16 | hg add c |
|
17 | 17 | hg commit -m 'no person' -d '1200000 0' -u 'other@place' |
|
18 | 18 | echo c >> c |
|
19 | 19 | hg commit -m 'no user, no domain' -d '1300000 0' -u 'person' |
|
20 | 20 | echo foo > .hg/branch |
|
21 | 21 | hg commit -m 'new branch' -d '1400000 0' -u 'person' |
|
22 | 22 | hg co -q 3 |
|
23 | 23 | echo other 4 >> d |
|
24 | 24 | hg add d |
|
25 | 25 | hg commit -m 'new head' -d '1500000 0' -u 'person' |
|
26 | 26 | hg merge -q foo |
|
27 | 27 | hg commit -m 'merge' -d '1500001 0' -u 'person' |
|
28 | 28 | # second branch starting at nullrev |
|
29 | 29 | hg update null |
|
30 | 30 | echo second > second |
|
31 | 31 | hg add second |
|
32 | 32 | hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>' |
|
33 | 33 | echo third > third |
|
34 | 34 | hg add third |
|
35 | hg mv second fourth | |
|
35 | 36 | hg commit -m third -d "2020-01-01 10:01" |
|
36 | 37 | |
|
37 | 38 | # make sure user/global hgrc does not affect tests |
|
38 | 39 | echo '[ui]' > .hg/hgrc |
|
39 | 40 | echo 'logtemplate =' >> .hg/hgrc |
|
40 | 41 | echo 'style =' >> .hg/hgrc |
|
41 | 42 | |
|
42 | 43 | echo '# default style is like normal output' |
|
43 | 44 | echo '# normal' |
|
44 | 45 | hg log > log.out |
|
45 | 46 | hg log --style default > style.out |
|
46 | 47 | cmp log.out style.out || diff -u log.out style.out |
|
47 | 48 | echo '# verbose' |
|
48 | 49 | hg log -v > log.out |
|
49 | 50 | hg log -v --style default > style.out |
|
50 | 51 | cmp log.out style.out || diff -u log.out style.out |
|
51 | 52 | echo '# debug' |
|
52 | 53 | hg log --debug > log.out |
|
53 | 54 | hg log --debug --style default > style.out |
|
54 | 55 | cmp log.out style.out || diff -u log.out style.out |
|
55 | 56 | |
|
56 | 57 | echo '# revision with no copies (used to print a traceback)' |
|
57 | 58 | hg tip -v --template '\n' |
|
58 | 59 | |
|
59 | 60 | echo '# compact style works' |
|
60 | 61 | hg log --style compact |
|
61 | 62 | hg log -v --style compact |
|
62 | 63 | hg log --debug --style compact |
|
63 | 64 | |
|
64 | 65 | echo '# error if style not readable' |
|
65 | 66 | touch q |
|
66 | 67 | chmod 0 q |
|
67 | 68 | hg log --style ./q |
|
68 | 69 | |
|
69 | 70 | echo '# error if no style' |
|
70 | 71 | hg log --style notexist |
|
71 | 72 | |
|
72 | 73 | echo '# error if style missing key' |
|
73 | 74 | echo 'q = q' > t |
|
74 | 75 | hg log --style ./t |
|
75 | 76 | |
|
76 | 77 | echo '# error if include fails' |
|
77 | 78 | echo 'changeset = q' >> t |
|
78 | 79 | hg log --style ./t |
|
79 | 80 | |
|
80 | 81 | echo '# include works' |
|
81 | 82 | rm q |
|
82 | 83 | echo '{rev}' > q |
|
83 | 84 | hg log --style ./t |
|
84 | 85 | |
|
85 | 86 | echo '# ui.style works' |
|
86 | 87 | echo '[ui]' > .hg/hgrc |
|
87 | 88 | echo 'style = t' >> .hg/hgrc |
|
88 | 89 | hg log |
|
89 | 90 | |
|
90 | 91 | echo '# issue338' |
|
91 | 92 | hg log --style=changelog > changelog |
|
92 | 93 | cat changelog |
|
93 | 94 | |
|
94 | 95 | echo "# keys work" |
|
95 | 96 | for key in author branches date desc file_adds file_dels file_mods \ |
|
96 |
files manifest node parents rev tags diffstat |
|
|
97 | 'file_copies%filecopy' files manifest node parents rev tags diffstat \ | |
|
98 | extras; do | |
|
97 | 99 | for mode in '' --verbose --debug; do |
|
98 | 100 | hg log $mode --template "$key$mode: {$key}\n" |
|
99 | 101 | done |
|
100 | 102 | done |
|
101 | 103 | |
|
102 | 104 | echo '# filters work' |
|
103 | 105 | hg log --template '{author|domain}\n' |
|
104 | 106 | hg log --template '{author|person}\n' |
|
105 | 107 | hg log --template '{author|user}\n' |
|
106 | 108 | hg log --template '{date|age}\n' > /dev/null || exit 1 |
|
107 | 109 | hg log -l1 --template '{date|age}\n' |
|
108 | 110 | hg log --template '{date|date}\n' |
|
109 | 111 | hg log --template '{date|isodate}\n' |
|
110 | 112 | hg log --template '{date|isodatesec}\n' |
|
111 | 113 | hg log --template '{date|rfc822date}\n' |
|
112 | 114 | hg log --template '{desc|firstline}\n' |
|
113 | 115 | hg log --template '{node|short}\n' |
|
114 | 116 | hg log --template '<changeset author="{author|xmlescape}"/>\n' |
|
115 | 117 | |
|
116 | 118 | echo '# formatnode filter works' |
|
117 | 119 | echo '# quiet' |
|
118 | 120 | hg -q log -r 0 --template '{node|formatnode}\n' |
|
119 | 121 | echo '# normal' |
|
120 | 122 | hg log -r 0 --template '{node|formatnode}\n' |
|
121 | 123 | echo '# verbose' |
|
122 | 124 | hg -v log -r 0 --template '{node|formatnode}\n' |
|
123 | 125 | echo '# debug' |
|
124 | 126 | hg --debug log -r 0 --template '{node|formatnode}\n' |
|
125 | 127 | |
|
126 | 128 | echo '# error on syntax' |
|
127 | 129 | echo 'x = "f' >> t |
|
128 | 130 | hg log |
|
129 | 131 | |
|
130 | 132 | cd .. |
|
131 | 133 | |
|
132 | 134 | echo '# latesttag' |
|
133 | 135 | hg init latesttag |
|
134 | 136 | cd latesttag |
|
135 | 137 | |
|
136 | 138 | echo a > file |
|
137 | 139 | hg ci -Am a -d '0 0' |
|
138 | 140 | |
|
139 | 141 | echo b >> file |
|
140 | 142 | hg ci -m b -d '1 0' |
|
141 | 143 | |
|
142 | 144 | echo c >> head1 |
|
143 | 145 | hg ci -Am h1c -d '2 0' |
|
144 | 146 | |
|
145 | 147 | hg update -q 1 |
|
146 | 148 | echo d >> head2 |
|
147 | 149 | hg ci -Am h2d -d '3 0' |
|
148 | 150 | |
|
149 | 151 | echo e >> head2 |
|
150 | 152 | hg ci -m h2e -d '4 0' |
|
151 | 153 | |
|
152 | 154 | hg merge -q |
|
153 | 155 | hg ci -m merge -d '5 0' |
|
154 | 156 | |
|
155 | 157 | echo '# No tag set' |
|
156 | 158 | hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
157 | 159 | |
|
158 | 160 | echo '# one common tag: longuest path wins' |
|
159 | 161 | hg tag -r 1 -m t1 -d '6 0' t1 |
|
160 | 162 | hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
161 | 163 | |
|
162 | 164 | echo '# one ancestor tag: more recent wins' |
|
163 | 165 | hg tag -r 2 -m t2 -d '7 0' t2 |
|
164 | 166 | hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
165 | 167 | |
|
166 | 168 | echo '# two branch tags: more recent wins' |
|
167 | 169 | hg tag -r 3 -m t3 -d '8 0' t3 |
|
168 | 170 | hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
169 | 171 | |
|
170 | 172 | echo '# merged tag overrides' |
|
171 | 173 | hg tag -r 5 -m t5 -d '9 0' t5 |
|
172 | 174 | hg tag -r 3 -m at3 -d '10 0' at3 |
|
173 | 175 | hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
174 | 176 | |
|
175 | 177 | echo '# done' |
@@ -1,753 +1,780 | |||
|
1 | 1 | created new head |
|
2 | 2 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
3 | 3 | created new head |
|
4 | 4 | # default style is like normal output |
|
5 | 5 | # normal |
|
6 | 6 | # verbose |
|
7 | 7 | # debug |
|
8 | 8 | # revision with no copies (used to print a traceback) |
|
9 | 9 | |
|
10 | 10 | # compact style works |
|
11 |
8[tip] |
|
|
11 | 8[tip] 3bdecc1cde0c 2020-01-01 10:01 +0000 test | |
|
12 | 12 | third |
|
13 | 13 | |
|
14 | 14 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 user |
|
15 | 15 | second |
|
16 | 16 | |
|
17 | 17 | 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person |
|
18 | 18 | merge |
|
19 | 19 | |
|
20 | 20 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
21 | 21 | new head |
|
22 | 22 | |
|
23 | 23 | 4 32a18f097fcc 1970-01-17 04:53 +0000 person |
|
24 | 24 | new branch |
|
25 | 25 | |
|
26 | 26 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
27 | 27 | no user, no domain |
|
28 | 28 | |
|
29 | 29 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other |
|
30 | 30 | no person |
|
31 | 31 | |
|
32 | 32 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 other |
|
33 | 33 | other 1 |
|
34 | 34 | |
|
35 | 35 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user |
|
36 | 36 | line 1 |
|
37 | 37 | |
|
38 |
8[tip] |
|
|
38 | 8[tip] 3bdecc1cde0c 2020-01-01 10:01 +0000 test | |
|
39 | 39 | third |
|
40 | 40 | |
|
41 | 41 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
42 | 42 | second |
|
43 | 43 | |
|
44 | 44 | 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person |
|
45 | 45 | merge |
|
46 | 46 | |
|
47 | 47 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
48 | 48 | new head |
|
49 | 49 | |
|
50 | 50 | 4 32a18f097fcc 1970-01-17 04:53 +0000 person |
|
51 | 51 | new branch |
|
52 | 52 | |
|
53 | 53 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
54 | 54 | no user, no domain |
|
55 | 55 | |
|
56 | 56 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other@place |
|
57 | 57 | no person |
|
58 | 58 | |
|
59 | 59 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> |
|
60 | 60 | other 1 |
|
61 | 61 | other 2 |
|
62 | 62 | |
|
63 | 63 | other 3 |
|
64 | 64 | |
|
65 | 65 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
66 | 66 | line 1 |
|
67 | 67 | line 2 |
|
68 | 68 | |
|
69 |
8[tip]:7,-1 |
|
|
69 | 8[tip]:7,-1 3bdecc1cde0c 2020-01-01 10:01 +0000 test | |
|
70 | 70 | third |
|
71 | 71 | |
|
72 | 72 | 7:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
73 | 73 | second |
|
74 | 74 | |
|
75 | 75 | 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person |
|
76 | 76 | merge |
|
77 | 77 | |
|
78 | 78 | 5:3,-1 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
79 | 79 | new head |
|
80 | 80 | |
|
81 | 81 | 4:3,-1 32a18f097fcc 1970-01-17 04:53 +0000 person |
|
82 | 82 | new branch |
|
83 | 83 | |
|
84 | 84 | 3:2,-1 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
85 | 85 | no user, no domain |
|
86 | 86 | |
|
87 | 87 | 2:1,-1 97054abb4ab8 1970-01-14 21:20 +0000 other@place |
|
88 | 88 | no person |
|
89 | 89 | |
|
90 | 90 | 1:0,-1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> |
|
91 | 91 | other 1 |
|
92 | 92 | other 2 |
|
93 | 93 | |
|
94 | 94 | other 3 |
|
95 | 95 | |
|
96 | 96 | 0:-1,-1 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
97 | 97 | line 1 |
|
98 | 98 | line 2 |
|
99 | 99 | |
|
100 | 100 | # error if style not readable |
|
101 | 101 | abort: Permission denied: ./q |
|
102 | 102 | # error if no style |
|
103 | 103 | abort: style not found: notexist |
|
104 | 104 | # error if style missing key |
|
105 | 105 | abort: ./t: no key named 'changeset' |
|
106 | 106 | # error if include fails |
|
107 | 107 | abort: template file ./q: Permission denied |
|
108 | 108 | # include works |
|
109 | 109 | 8 |
|
110 | 110 | 7 |
|
111 | 111 | 6 |
|
112 | 112 | 5 |
|
113 | 113 | 4 |
|
114 | 114 | 3 |
|
115 | 115 | 2 |
|
116 | 116 | 1 |
|
117 | 117 | 0 |
|
118 | 118 | # ui.style works |
|
119 | 119 | 8 |
|
120 | 120 | 7 |
|
121 | 121 | 6 |
|
122 | 122 | 5 |
|
123 | 123 | 4 |
|
124 | 124 | 3 |
|
125 | 125 | 2 |
|
126 | 126 | 1 |
|
127 | 127 | 0 |
|
128 | 128 | # issue338 |
|
129 | 129 | 2020-01-01 test <test> |
|
130 | 130 | |
|
131 | * third: | |
|
131 | * fourth, second, third: | |
|
132 | 132 | third |
|
133 | [946e2bd9c565] [tip] | |
|
133 | [3bdecc1cde0c] [tip] | |
|
134 | 134 | |
|
135 | 135 | 1970-01-12 User Name <user@hostname> |
|
136 | 136 | |
|
137 | 137 | * second: |
|
138 | 138 | second |
|
139 | 139 | [29114dbae42b] |
|
140 | 140 | |
|
141 | 141 | 1970-01-18 person <person> |
|
142 | 142 | |
|
143 | 143 | * merge |
|
144 | 144 | [c7b487c6c50e] |
|
145 | 145 | |
|
146 | 146 | * d: |
|
147 | 147 | new head |
|
148 | 148 | [13207e5a10d9] |
|
149 | 149 | |
|
150 | 150 | 1970-01-17 person <person> |
|
151 | 151 | |
|
152 | 152 | * new branch |
|
153 | 153 | [32a18f097fcc] <foo> |
|
154 | 154 | |
|
155 | 155 | 1970-01-16 person <person> |
|
156 | 156 | |
|
157 | 157 | * c: |
|
158 | 158 | no user, no domain |
|
159 | 159 | [10e46f2dcbf4] |
|
160 | 160 | |
|
161 | 161 | 1970-01-14 other <other@place> |
|
162 | 162 | |
|
163 | 163 | * c: |
|
164 | 164 | no person |
|
165 | 165 | [97054abb4ab8] |
|
166 | 166 | |
|
167 | 167 | 1970-01-13 A. N. Other <other@place> |
|
168 | 168 | |
|
169 | 169 | * b: |
|
170 | 170 | other 1 other 2 |
|
171 | 171 | |
|
172 | 172 | other 3 |
|
173 | 173 | [b608e9d1a3f0] |
|
174 | 174 | |
|
175 | 175 | 1970-01-12 User Name <user@hostname> |
|
176 | 176 | |
|
177 | 177 | * a: |
|
178 | 178 | line 1 line 2 |
|
179 | 179 | [1e4e1b8f71e0] |
|
180 | 180 | |
|
181 | 181 | # keys work |
|
182 | 182 | author: test |
|
183 | 183 | author: User Name <user@hostname> |
|
184 | 184 | author: person |
|
185 | 185 | author: person |
|
186 | 186 | author: person |
|
187 | 187 | author: person |
|
188 | 188 | author: other@place |
|
189 | 189 | author: A. N. Other <other@place> |
|
190 | 190 | author: User Name <user@hostname> |
|
191 | 191 | author--verbose: test |
|
192 | 192 | author--verbose: User Name <user@hostname> |
|
193 | 193 | author--verbose: person |
|
194 | 194 | author--verbose: person |
|
195 | 195 | author--verbose: person |
|
196 | 196 | author--verbose: person |
|
197 | 197 | author--verbose: other@place |
|
198 | 198 | author--verbose: A. N. Other <other@place> |
|
199 | 199 | author--verbose: User Name <user@hostname> |
|
200 | 200 | author--debug: test |
|
201 | 201 | author--debug: User Name <user@hostname> |
|
202 | 202 | author--debug: person |
|
203 | 203 | author--debug: person |
|
204 | 204 | author--debug: person |
|
205 | 205 | author--debug: person |
|
206 | 206 | author--debug: other@place |
|
207 | 207 | author--debug: A. N. Other <other@place> |
|
208 | 208 | author--debug: User Name <user@hostname> |
|
209 | 209 | branches: |
|
210 | 210 | branches: |
|
211 | 211 | branches: |
|
212 | 212 | branches: |
|
213 | 213 | branches: foo |
|
214 | 214 | branches: |
|
215 | 215 | branches: |
|
216 | 216 | branches: |
|
217 | 217 | branches: |
|
218 | 218 | branches--verbose: |
|
219 | 219 | branches--verbose: |
|
220 | 220 | branches--verbose: |
|
221 | 221 | branches--verbose: |
|
222 | 222 | branches--verbose: foo |
|
223 | 223 | branches--verbose: |
|
224 | 224 | branches--verbose: |
|
225 | 225 | branches--verbose: |
|
226 | 226 | branches--verbose: |
|
227 | 227 | branches--debug: |
|
228 | 228 | branches--debug: |
|
229 | 229 | branches--debug: |
|
230 | 230 | branches--debug: |
|
231 | 231 | branches--debug: foo |
|
232 | 232 | branches--debug: |
|
233 | 233 | branches--debug: |
|
234 | 234 | branches--debug: |
|
235 | 235 | branches--debug: |
|
236 | 236 | date: 1577872860.00 |
|
237 | 237 | date: 1000000.00 |
|
238 | 238 | date: 1500001.00 |
|
239 | 239 | date: 1500000.00 |
|
240 | 240 | date: 1400000.00 |
|
241 | 241 | date: 1300000.00 |
|
242 | 242 | date: 1200000.00 |
|
243 | 243 | date: 1100000.00 |
|
244 | 244 | date: 1000000.00 |
|
245 | 245 | date--verbose: 1577872860.00 |
|
246 | 246 | date--verbose: 1000000.00 |
|
247 | 247 | date--verbose: 1500001.00 |
|
248 | 248 | date--verbose: 1500000.00 |
|
249 | 249 | date--verbose: 1400000.00 |
|
250 | 250 | date--verbose: 1300000.00 |
|
251 | 251 | date--verbose: 1200000.00 |
|
252 | 252 | date--verbose: 1100000.00 |
|
253 | 253 | date--verbose: 1000000.00 |
|
254 | 254 | date--debug: 1577872860.00 |
|
255 | 255 | date--debug: 1000000.00 |
|
256 | 256 | date--debug: 1500001.00 |
|
257 | 257 | date--debug: 1500000.00 |
|
258 | 258 | date--debug: 1400000.00 |
|
259 | 259 | date--debug: 1300000.00 |
|
260 | 260 | date--debug: 1200000.00 |
|
261 | 261 | date--debug: 1100000.00 |
|
262 | 262 | date--debug: 1000000.00 |
|
263 | 263 | desc: third |
|
264 | 264 | desc: second |
|
265 | 265 | desc: merge |
|
266 | 266 | desc: new head |
|
267 | 267 | desc: new branch |
|
268 | 268 | desc: no user, no domain |
|
269 | 269 | desc: no person |
|
270 | 270 | desc: other 1 |
|
271 | 271 | other 2 |
|
272 | 272 | |
|
273 | 273 | other 3 |
|
274 | 274 | desc: line 1 |
|
275 | 275 | line 2 |
|
276 | 276 | desc--verbose: third |
|
277 | 277 | desc--verbose: second |
|
278 | 278 | desc--verbose: merge |
|
279 | 279 | desc--verbose: new head |
|
280 | 280 | desc--verbose: new branch |
|
281 | 281 | desc--verbose: no user, no domain |
|
282 | 282 | desc--verbose: no person |
|
283 | 283 | desc--verbose: other 1 |
|
284 | 284 | other 2 |
|
285 | 285 | |
|
286 | 286 | other 3 |
|
287 | 287 | desc--verbose: line 1 |
|
288 | 288 | line 2 |
|
289 | 289 | desc--debug: third |
|
290 | 290 | desc--debug: second |
|
291 | 291 | desc--debug: merge |
|
292 | 292 | desc--debug: new head |
|
293 | 293 | desc--debug: new branch |
|
294 | 294 | desc--debug: no user, no domain |
|
295 | 295 | desc--debug: no person |
|
296 | 296 | desc--debug: other 1 |
|
297 | 297 | other 2 |
|
298 | 298 | |
|
299 | 299 | other 3 |
|
300 | 300 | desc--debug: line 1 |
|
301 | 301 | line 2 |
|
302 | file_adds: third | |
|
302 | file_adds: fourth third | |
|
303 | 303 | file_adds: second |
|
304 | 304 | file_adds: |
|
305 | 305 | file_adds: d |
|
306 | 306 | file_adds: |
|
307 | 307 | file_adds: |
|
308 | 308 | file_adds: c |
|
309 | 309 | file_adds: b |
|
310 | 310 | file_adds: a |
|
311 | file_adds--verbose: third | |
|
311 | file_adds--verbose: fourth third | |
|
312 | 312 | file_adds--verbose: second |
|
313 | 313 | file_adds--verbose: |
|
314 | 314 | file_adds--verbose: d |
|
315 | 315 | file_adds--verbose: |
|
316 | 316 | file_adds--verbose: |
|
317 | 317 | file_adds--verbose: c |
|
318 | 318 | file_adds--verbose: b |
|
319 | 319 | file_adds--verbose: a |
|
320 | file_adds--debug: third | |
|
320 | file_adds--debug: fourth third | |
|
321 | 321 | file_adds--debug: second |
|
322 | 322 | file_adds--debug: |
|
323 | 323 | file_adds--debug: d |
|
324 | 324 | file_adds--debug: |
|
325 | 325 | file_adds--debug: |
|
326 | 326 | file_adds--debug: c |
|
327 | 327 | file_adds--debug: b |
|
328 | 328 | file_adds--debug: a |
|
329 | file_dels: | |
|
329 | file_dels: second | |
|
330 | 330 | file_dels: |
|
331 | 331 | file_dels: |
|
332 | 332 | file_dels: |
|
333 | 333 | file_dels: |
|
334 | 334 | file_dels: |
|
335 | 335 | file_dels: |
|
336 | 336 | file_dels: |
|
337 | 337 | file_dels: |
|
338 | file_dels--verbose: second | |
|
338 | 339 | file_dels--verbose: |
|
339 | 340 | file_dels--verbose: |
|
340 | 341 | file_dels--verbose: |
|
341 | 342 | file_dels--verbose: |
|
342 | 343 | file_dels--verbose: |
|
343 | 344 | file_dels--verbose: |
|
344 | 345 | file_dels--verbose: |
|
345 | 346 | file_dels--verbose: |
|
346 |
file_dels-- |
|
|
347 | file_dels--debug: | |
|
347 | file_dels--debug: second | |
|
348 | 348 | file_dels--debug: |
|
349 | 349 | file_dels--debug: |
|
350 | 350 | file_dels--debug: |
|
351 | 351 | file_dels--debug: |
|
352 | 352 | file_dels--debug: |
|
353 | 353 | file_dels--debug: |
|
354 | 354 | file_dels--debug: |
|
355 | 355 | file_dels--debug: |
|
356 | 356 | file_mods: |
|
357 | 357 | file_mods: |
|
358 | 358 | file_mods: |
|
359 | 359 | file_mods: |
|
360 | 360 | file_mods: |
|
361 | 361 | file_mods: c |
|
362 | 362 | file_mods: |
|
363 | 363 | file_mods: |
|
364 | 364 | file_mods: |
|
365 | 365 | file_mods--verbose: |
|
366 | 366 | file_mods--verbose: |
|
367 | 367 | file_mods--verbose: |
|
368 | 368 | file_mods--verbose: |
|
369 | 369 | file_mods--verbose: |
|
370 | 370 | file_mods--verbose: c |
|
371 | 371 | file_mods--verbose: |
|
372 | 372 | file_mods--verbose: |
|
373 | 373 | file_mods--verbose: |
|
374 | 374 | file_mods--debug: |
|
375 | 375 | file_mods--debug: |
|
376 | 376 | file_mods--debug: |
|
377 | 377 | file_mods--debug: |
|
378 | 378 | file_mods--debug: |
|
379 | 379 | file_mods--debug: c |
|
380 | 380 | file_mods--debug: |
|
381 | 381 | file_mods--debug: |
|
382 | 382 | file_mods--debug: |
|
383 | files: third | |
|
383 | file_copies%filecopy: | |
|
384 | file_copies%filecopy: | |
|
385 | file_copies%filecopy: | |
|
386 | file_copies%filecopy: | |
|
387 | file_copies%filecopy: | |
|
388 | file_copies%filecopy: | |
|
389 | file_copies%filecopy: | |
|
390 | file_copies%filecopy: | |
|
391 | file_copies%filecopy: | |
|
392 | file_copies%filecopy--verbose: | |
|
393 | file_copies%filecopy--verbose: | |
|
394 | file_copies%filecopy--verbose: | |
|
395 | file_copies%filecopy--verbose: | |
|
396 | file_copies%filecopy--verbose: | |
|
397 | file_copies%filecopy--verbose: | |
|
398 | file_copies%filecopy--verbose: | |
|
399 | file_copies%filecopy--verbose: | |
|
400 | file_copies%filecopy--verbose: | |
|
401 | file_copies%filecopy--debug: | |
|
402 | file_copies%filecopy--debug: | |
|
403 | file_copies%filecopy--debug: | |
|
404 | file_copies%filecopy--debug: | |
|
405 | file_copies%filecopy--debug: | |
|
406 | file_copies%filecopy--debug: | |
|
407 | file_copies%filecopy--debug: | |
|
408 | file_copies%filecopy--debug: | |
|
409 | file_copies%filecopy--debug: | |
|
410 | files: fourth second third | |
|
384 | 411 | files: second |
|
385 | 412 | files: |
|
386 | 413 | files: d |
|
387 | 414 | files: |
|
388 | 415 | files: c |
|
389 | 416 | files: c |
|
390 | 417 | files: b |
|
391 | 418 | files: a |
|
392 | files--verbose: third | |
|
419 | files--verbose: fourth second third | |
|
393 | 420 | files--verbose: second |
|
394 | 421 | files--verbose: |
|
395 | 422 | files--verbose: d |
|
396 | 423 | files--verbose: |
|
397 | 424 | files--verbose: c |
|
398 | 425 | files--verbose: c |
|
399 | 426 | files--verbose: b |
|
400 | 427 | files--verbose: a |
|
401 | files--debug: third | |
|
428 | files--debug: fourth second third | |
|
402 | 429 | files--debug: second |
|
403 | 430 | files--debug: |
|
404 | 431 | files--debug: d |
|
405 | 432 | files--debug: |
|
406 | 433 | files--debug: c |
|
407 | 434 | files--debug: c |
|
408 | 435 | files--debug: b |
|
409 | 436 | files--debug: a |
|
410 | manifest: 8:8a0d8faab8b2 | |
|
437 | manifest: 8:79c71159cb0a | |
|
411 | 438 | manifest: 7:f2dbc354b94e |
|
412 | 439 | manifest: 6:91015e9dbdd7 |
|
413 | 440 | manifest: 5:4dc3def4f9b4 |
|
414 | 441 | manifest: 4:90ae8dda64e1 |
|
415 | 442 | manifest: 3:cb5a1327723b |
|
416 | 443 | manifest: 2:6e0e82995c35 |
|
417 | 444 | manifest: 1:4e8d705b1e53 |
|
418 | 445 | manifest: 0:a0c8bcbbb45c |
|
419 |
manifest--verbose: 8: |
|
|
446 | manifest--verbose: 8:79c71159cb0a | |
|
420 | 447 | manifest--verbose: 7:f2dbc354b94e |
|
421 | 448 | manifest--verbose: 6:91015e9dbdd7 |
|
422 | 449 | manifest--verbose: 5:4dc3def4f9b4 |
|
423 | 450 | manifest--verbose: 4:90ae8dda64e1 |
|
424 | 451 | manifest--verbose: 3:cb5a1327723b |
|
425 | 452 | manifest--verbose: 2:6e0e82995c35 |
|
426 | 453 | manifest--verbose: 1:4e8d705b1e53 |
|
427 | 454 | manifest--verbose: 0:a0c8bcbbb45c |
|
428 | manifest--debug: 8:8a0d8faab8b2eee97dcfccabbcb18f413c9d097b | |
|
455 | manifest--debug: 8:79c71159cb0a1a84add78e7922a1e5e7be34c499 | |
|
429 | 456 | manifest--debug: 7:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf |
|
430 | 457 | manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf |
|
431 | 458 | manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 |
|
432 | 459 | manifest--debug: 4:90ae8dda64e1a876c792bccb9af66284f6018363 |
|
433 | 460 | manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
434 | 461 | manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 |
|
435 | 462 | manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 |
|
436 | 463 | manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
437 | node: 946e2bd9c565394777d74d9669045b39e856e3ea | |
|
464 | node: 3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57 | |
|
438 | 465 | node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
439 | 466 | node: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f |
|
440 | 467 | node: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
441 | 468 | node: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 |
|
442 | 469 | node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
443 | 470 | node: 97054abb4ab824450e9164180baf491ae0078465 |
|
444 | 471 | node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
445 | 472 | node: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
446 | node--verbose: 946e2bd9c565394777d74d9669045b39e856e3ea | |
|
473 | node--verbose: 3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57 | |
|
447 | 474 | node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
448 | 475 | node--verbose: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f |
|
449 | 476 | node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
450 | 477 | node--verbose: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 |
|
451 | 478 | node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
452 | 479 | node--verbose: 97054abb4ab824450e9164180baf491ae0078465 |
|
453 | 480 | node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
454 | 481 | node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
455 | node--debug: 946e2bd9c565394777d74d9669045b39e856e3ea | |
|
482 | node--debug: 3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57 | |
|
456 | 483 | node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
457 | 484 | node--debug: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f |
|
458 | 485 | node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
459 | 486 | node--debug: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 |
|
460 | 487 | node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
461 | 488 | node--debug: 97054abb4ab824450e9164180baf491ae0078465 |
|
462 | 489 | node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
463 | 490 | node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
464 | 491 | parents: |
|
465 | 492 | parents: -1:000000000000 |
|
466 | 493 | parents: 5:13207e5a10d9 4:32a18f097fcc |
|
467 | 494 | parents: 3:10e46f2dcbf4 |
|
468 | 495 | parents: |
|
469 | 496 | parents: |
|
470 | 497 | parents: |
|
471 | 498 | parents: |
|
472 | 499 | parents: |
|
473 | 500 | parents--verbose: |
|
474 | 501 | parents--verbose: -1:000000000000 |
|
475 | 502 | parents--verbose: 5:13207e5a10d9 4:32a18f097fcc |
|
476 | 503 | parents--verbose: 3:10e46f2dcbf4 |
|
477 | 504 | parents--verbose: |
|
478 | 505 | parents--verbose: |
|
479 | 506 | parents--verbose: |
|
480 | 507 | parents--verbose: |
|
481 | 508 | parents--verbose: |
|
482 | 509 | parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 |
|
483 | 510 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 |
|
484 | 511 | parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:32a18f097fcccf76ef282f62f8a85b3adf8d13c4 |
|
485 | 512 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 |
|
486 | 513 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 |
|
487 | 514 | parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 |
|
488 | 515 | parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 |
|
489 | 516 | parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 |
|
490 | 517 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 |
|
491 | 518 | rev: 8 |
|
492 | 519 | rev: 7 |
|
493 | 520 | rev: 6 |
|
494 | 521 | rev: 5 |
|
495 | 522 | rev: 4 |
|
496 | 523 | rev: 3 |
|
497 | 524 | rev: 2 |
|
498 | 525 | rev: 1 |
|
499 | 526 | rev: 0 |
|
500 | 527 | rev--verbose: 8 |
|
501 | 528 | rev--verbose: 7 |
|
502 | 529 | rev--verbose: 6 |
|
503 | 530 | rev--verbose: 5 |
|
504 | 531 | rev--verbose: 4 |
|
505 | 532 | rev--verbose: 3 |
|
506 | 533 | rev--verbose: 2 |
|
507 | 534 | rev--verbose: 1 |
|
508 | 535 | rev--verbose: 0 |
|
509 | 536 | rev--debug: 8 |
|
510 | 537 | rev--debug: 7 |
|
511 | 538 | rev--debug: 6 |
|
512 | 539 | rev--debug: 5 |
|
513 | 540 | rev--debug: 4 |
|
514 | 541 | rev--debug: 3 |
|
515 | 542 | rev--debug: 2 |
|
516 | 543 | rev--debug: 1 |
|
517 | 544 | rev--debug: 0 |
|
518 | 545 | tags: tip |
|
519 | 546 | tags: |
|
520 | 547 | tags: |
|
521 | 548 | tags: |
|
522 | 549 | tags: |
|
523 | 550 | tags: |
|
524 | 551 | tags: |
|
525 | 552 | tags: |
|
526 | 553 | tags: |
|
527 | 554 | tags--verbose: tip |
|
528 | 555 | tags--verbose: |
|
529 | 556 | tags--verbose: |
|
530 | 557 | tags--verbose: |
|
531 | 558 | tags--verbose: |
|
532 | 559 | tags--verbose: |
|
533 | 560 | tags--verbose: |
|
534 | 561 | tags--verbose: |
|
535 | 562 | tags--verbose: |
|
536 | 563 | tags--debug: tip |
|
537 | 564 | tags--debug: |
|
538 | 565 | tags--debug: |
|
539 | 566 | tags--debug: |
|
540 | 567 | tags--debug: |
|
541 | 568 | tags--debug: |
|
542 | 569 | tags--debug: |
|
543 | 570 | tags--debug: |
|
544 | 571 | tags--debug: |
|
545 |
diffstat: |
|
|
572 | diffstat: 3: +2/-1 | |
|
546 | 573 | diffstat: 1: +1/-0 |
|
547 | 574 | diffstat: 0: +0/-0 |
|
548 | 575 | diffstat: 1: +1/-0 |
|
549 | 576 | diffstat: 0: +0/-0 |
|
550 | 577 | diffstat: 1: +1/-0 |
|
551 | 578 | diffstat: 1: +4/-0 |
|
552 | 579 | diffstat: 1: +2/-0 |
|
553 | 580 | diffstat: 1: +1/-0 |
|
554 |
diffstat--verbose: |
|
|
581 | diffstat--verbose: 3: +2/-1 | |
|
555 | 582 | diffstat--verbose: 1: +1/-0 |
|
556 | 583 | diffstat--verbose: 0: +0/-0 |
|
557 | 584 | diffstat--verbose: 1: +1/-0 |
|
558 | 585 | diffstat--verbose: 0: +0/-0 |
|
559 | 586 | diffstat--verbose: 1: +1/-0 |
|
560 | 587 | diffstat--verbose: 1: +4/-0 |
|
561 | 588 | diffstat--verbose: 1: +2/-0 |
|
562 | 589 | diffstat--verbose: 1: +1/-0 |
|
563 |
diffstat--debug: |
|
|
590 | diffstat--debug: 3: +2/-1 | |
|
564 | 591 | diffstat--debug: 1: +1/-0 |
|
565 | 592 | diffstat--debug: 0: +0/-0 |
|
566 | 593 | diffstat--debug: 1: +1/-0 |
|
567 | 594 | diffstat--debug: 0: +0/-0 |
|
568 | 595 | diffstat--debug: 1: +1/-0 |
|
569 | 596 | diffstat--debug: 1: +4/-0 |
|
570 | 597 | diffstat--debug: 1: +2/-0 |
|
571 | 598 | diffstat--debug: 1: +1/-0 |
|
572 | 599 | extras: branch=default |
|
573 | 600 | extras: branch=default |
|
574 | 601 | extras: branch=default |
|
575 | 602 | extras: branch=default |
|
576 | 603 | extras: branch=foo |
|
577 | 604 | extras: branch=default |
|
578 | 605 | extras: branch=default |
|
579 | 606 | extras: branch=default |
|
580 | 607 | extras: branch=default |
|
581 | 608 | extras--verbose: branch=default |
|
582 | 609 | extras--verbose: branch=default |
|
583 | 610 | extras--verbose: branch=default |
|
584 | 611 | extras--verbose: branch=default |
|
585 | 612 | extras--verbose: branch=foo |
|
586 | 613 | extras--verbose: branch=default |
|
587 | 614 | extras--verbose: branch=default |
|
588 | 615 | extras--verbose: branch=default |
|
589 | 616 | extras--verbose: branch=default |
|
590 | 617 | extras--debug: branch=default |
|
591 | 618 | extras--debug: branch=default |
|
592 | 619 | extras--debug: branch=default |
|
593 | 620 | extras--debug: branch=default |
|
594 | 621 | extras--debug: branch=foo |
|
595 | 622 | extras--debug: branch=default |
|
596 | 623 | extras--debug: branch=default |
|
597 | 624 | extras--debug: branch=default |
|
598 | 625 | extras--debug: branch=default |
|
599 | 626 | # filters work |
|
600 | 627 | |
|
601 | 628 | hostname |
|
602 | 629 | |
|
603 | 630 | |
|
604 | 631 | |
|
605 | 632 | |
|
606 | 633 | place |
|
607 | 634 | place |
|
608 | 635 | hostname |
|
609 | 636 | test |
|
610 | 637 | User Name |
|
611 | 638 | person |
|
612 | 639 | person |
|
613 | 640 | person |
|
614 | 641 | person |
|
615 | 642 | other |
|
616 | 643 | A. N. Other |
|
617 | 644 | User Name |
|
618 | 645 | test |
|
619 | 646 | user |
|
620 | 647 | person |
|
621 | 648 | person |
|
622 | 649 | person |
|
623 | 650 | person |
|
624 | 651 | other |
|
625 | 652 | other |
|
626 | 653 | user |
|
627 | 654 | in the future |
|
628 | 655 | Wed Jan 01 10:01:00 2020 +0000 |
|
629 | 656 | Mon Jan 12 13:46:40 1970 +0000 |
|
630 | 657 | Sun Jan 18 08:40:01 1970 +0000 |
|
631 | 658 | Sun Jan 18 08:40:00 1970 +0000 |
|
632 | 659 | Sat Jan 17 04:53:20 1970 +0000 |
|
633 | 660 | Fri Jan 16 01:06:40 1970 +0000 |
|
634 | 661 | Wed Jan 14 21:20:00 1970 +0000 |
|
635 | 662 | Tue Jan 13 17:33:20 1970 +0000 |
|
636 | 663 | Mon Jan 12 13:46:40 1970 +0000 |
|
637 | 664 | 2020-01-01 10:01 +0000 |
|
638 | 665 | 1970-01-12 13:46 +0000 |
|
639 | 666 | 1970-01-18 08:40 +0000 |
|
640 | 667 | 1970-01-18 08:40 +0000 |
|
641 | 668 | 1970-01-17 04:53 +0000 |
|
642 | 669 | 1970-01-16 01:06 +0000 |
|
643 | 670 | 1970-01-14 21:20 +0000 |
|
644 | 671 | 1970-01-13 17:33 +0000 |
|
645 | 672 | 1970-01-12 13:46 +0000 |
|
646 | 673 | 2020-01-01 10:01:00 +0000 |
|
647 | 674 | 1970-01-12 13:46:40 +0000 |
|
648 | 675 | 1970-01-18 08:40:01 +0000 |
|
649 | 676 | 1970-01-18 08:40:00 +0000 |
|
650 | 677 | 1970-01-17 04:53:20 +0000 |
|
651 | 678 | 1970-01-16 01:06:40 +0000 |
|
652 | 679 | 1970-01-14 21:20:00 +0000 |
|
653 | 680 | 1970-01-13 17:33:20 +0000 |
|
654 | 681 | 1970-01-12 13:46:40 +0000 |
|
655 | 682 | Wed, 01 Jan 2020 10:01:00 +0000 |
|
656 | 683 | Mon, 12 Jan 1970 13:46:40 +0000 |
|
657 | 684 | Sun, 18 Jan 1970 08:40:01 +0000 |
|
658 | 685 | Sun, 18 Jan 1970 08:40:00 +0000 |
|
659 | 686 | Sat, 17 Jan 1970 04:53:20 +0000 |
|
660 | 687 | Fri, 16 Jan 1970 01:06:40 +0000 |
|
661 | 688 | Wed, 14 Jan 1970 21:20:00 +0000 |
|
662 | 689 | Tue, 13 Jan 1970 17:33:20 +0000 |
|
663 | 690 | Mon, 12 Jan 1970 13:46:40 +0000 |
|
664 | 691 | third |
|
665 | 692 | second |
|
666 | 693 | merge |
|
667 | 694 | new head |
|
668 | 695 | new branch |
|
669 | 696 | no user, no domain |
|
670 | 697 | no person |
|
671 | 698 | other 1 |
|
672 | 699 | line 1 |
|
673 | 946e2bd9c565 | |
|
700 | 3bdecc1cde0c | |
|
674 | 701 | 29114dbae42b |
|
675 | 702 | c7b487c6c50e |
|
676 | 703 | 13207e5a10d9 |
|
677 | 704 | 32a18f097fcc |
|
678 | 705 | 10e46f2dcbf4 |
|
679 | 706 | 97054abb4ab8 |
|
680 | 707 | b608e9d1a3f0 |
|
681 | 708 | 1e4e1b8f71e0 |
|
682 | 709 | <changeset author="test"/> |
|
683 | 710 | <changeset author="User Name <user@hostname>"/> |
|
684 | 711 | <changeset author="person"/> |
|
685 | 712 | <changeset author="person"/> |
|
686 | 713 | <changeset author="person"/> |
|
687 | 714 | <changeset author="person"/> |
|
688 | 715 | <changeset author="other@place"/> |
|
689 | 716 | <changeset author="A. N. Other <other@place>"/> |
|
690 | 717 | <changeset author="User Name <user@hostname>"/> |
|
691 | 718 | # formatnode filter works |
|
692 | 719 | # quiet |
|
693 | 720 | 1e4e1b8f71e0 |
|
694 | 721 | # normal |
|
695 | 722 | 1e4e1b8f71e0 |
|
696 | 723 | # verbose |
|
697 | 724 | 1e4e1b8f71e0 |
|
698 | 725 | # debug |
|
699 | 726 | 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
700 | 727 | # error on syntax |
|
701 | 728 | abort: t:3: unmatched quotes |
|
702 | 729 | # latesttag |
|
703 | 730 | adding file |
|
704 | 731 | adding head1 |
|
705 | 732 | adding head2 |
|
706 | 733 | created new head |
|
707 | 734 | # No tag set |
|
708 | 735 | 5: null+5 |
|
709 | 736 | 4: null+4 |
|
710 | 737 | 3: null+3 |
|
711 | 738 | 2: null+3 |
|
712 | 739 | 1: null+2 |
|
713 | 740 | 0: null+1 |
|
714 | 741 | # one common tag: longuest path wins |
|
715 | 742 | 6: t1+4 |
|
716 | 743 | 5: t1+3 |
|
717 | 744 | 4: t1+2 |
|
718 | 745 | 3: t1+1 |
|
719 | 746 | 2: t1+1 |
|
720 | 747 | 1: t1+0 |
|
721 | 748 | 0: null+1 |
|
722 | 749 | # one ancestor tag: more recent wins |
|
723 | 750 | 7: t2+3 |
|
724 | 751 | 6: t2+2 |
|
725 | 752 | 5: t2+1 |
|
726 | 753 | 4: t1+2 |
|
727 | 754 | 3: t1+1 |
|
728 | 755 | 2: t2+0 |
|
729 | 756 | 1: t1+0 |
|
730 | 757 | 0: null+1 |
|
731 | 758 | # two branch tags: more recent wins |
|
732 | 759 | 8: t3+5 |
|
733 | 760 | 7: t3+4 |
|
734 | 761 | 6: t3+3 |
|
735 | 762 | 5: t3+2 |
|
736 | 763 | 4: t3+1 |
|
737 | 764 | 3: t3+0 |
|
738 | 765 | 2: t2+0 |
|
739 | 766 | 1: t1+0 |
|
740 | 767 | 0: null+1 |
|
741 | 768 | # merged tag overrides |
|
742 | 769 | 10: t5+5 |
|
743 | 770 | 9: t5+4 |
|
744 | 771 | 8: t5+3 |
|
745 | 772 | 7: t5+2 |
|
746 | 773 | 6: t5+1 |
|
747 | 774 | 5: t5+0 |
|
748 | 775 | 4: at3:t3+1 |
|
749 | 776 | 3: at3:t3+0 |
|
750 | 777 | 2: t2+0 |
|
751 | 778 | 1: t1+0 |
|
752 | 779 | 0: null+1 |
|
753 | 780 | # done |
General Comments 0
You need to be logged in to leave comments.
Login now