Show More
| @@ -1,21 +1,21 b'' | |||||
| 1 | # basic operation |
|
1 | # basic operation | |
| 2 | adding a |
|
2 | adding a | |
| 3 |
changeset 2: |
|
3 | changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57 | |
| 4 | a |
|
4 | a | |
| 5 | # file that was removed is recreated |
|
5 | # file that was removed is recreated | |
| 6 | adding a |
|
6 | adding a | |
| 7 | adding a |
|
7 | adding a | |
| 8 |
changeset 2: |
|
8 | changeset 2:44cd84c7349a backs out changeset 1:76862dcce372 | |
| 9 | content |
|
9 | content | |
| 10 | # backout of backout is as if nothing happened |
|
10 | # backout of backout is as if nothing happened | |
| 11 | removing a |
|
11 | removing a | |
| 12 |
changeset 3: |
|
12 | changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a | |
| 13 | cat: a: No such file or directory |
|
13 | cat: a: No such file or directory | |
| 14 | # backout with merge |
|
14 | # backout with merge | |
| 15 | adding a |
|
15 | adding a | |
| 16 |
changeset 3: |
|
16 | changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 | |
| 17 | merging with changeset 2:b66ea5b77abb |
|
17 | merging with changeset 2:b66ea5b77abb | |
| 18 | merging a |
|
18 | merging a | |
| 19 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
19 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 20 | (branch merge, don't forget to commit) |
|
20 | (branch merge, don't forget to commit) | |
| 21 | line 1 |
|
21 | line 1 | |
| @@ -1,261 +1,255 b'' | |||||
| 1 | # default style is like normal output |
|
1 | # default style is like normal output | |
| 2 | 18a19 |
|
2 | 18a19 | |
| 3 | > files: |
|
3 | > files: | |
| 4 | 29a31 |
|
4 | 29a31 | |
| 5 | > files: |
|
5 | > files: | |
| 6 | 43a46 |
|
6 | 43a46 | |
| 7 | > files: |
|
7 | > files: | |
| 8 | # compact style works |
|
8 | # compact style works | |
| 9 |
3[tip] |
|
9 | 3[tip] 10e46f2dcbf4 1970-01-16 01:06 +0000 person | |
| 10 | no user, no domain |
|
10 | no user, no domain | |
| 11 |
|
11 | |||
| 12 |
2 |
|
12 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other | |
| 13 | no person |
|
13 | no person | |
| 14 |
|
14 | |||
| 15 |
1 |
|
15 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 other | |
| 16 | other 1 |
|
16 | other 1 | |
| 17 |
|
17 | |||
| 18 |
0 |
|
18 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user | |
| 19 | line 1 |
|
19 | line 1 | |
| 20 |
|
20 | |||
| 21 |
3[tip] |
|
21 | 3[tip] 10e46f2dcbf4 1970-01-16 01:06 +0000 person | |
| 22 | no user, no domain |
|
22 | no user, no domain | |
| 23 |
|
23 | |||
| 24 |
2 |
|
24 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other | |
| 25 | no person |
|
25 | no person | |
| 26 |
|
26 | |||
| 27 |
1 |
|
27 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 other | |
| 28 | other 1 |
|
28 | other 1 | |
| 29 |
|
29 | |||
| 30 |
0 |
|
30 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user | |
| 31 | line 1 |
|
31 | line 1 | |
| 32 |
|
32 | |||
| 33 |
3[tip]:2,-1 |
|
33 | 3[tip]:2,-1 10e46f2dcbf4 1970-01-16 01:06 +0000 person | |
| 34 | no user, no domain |
|
34 | no user, no domain | |
| 35 |
|
35 | |||
| 36 |
2:1,-1 |
|
36 | 2:1,-1 97054abb4ab8 1970-01-14 21:20 +0000 other | |
| 37 | no person |
|
37 | no person | |
| 38 |
|
38 | |||
| 39 |
1:0,-1 |
|
39 | 1:0,-1 b608e9d1a3f0 1970-01-13 17:33 +0000 other | |
| 40 | other 1 |
|
40 | other 1 | |
| 41 |
|
41 | |||
| 42 |
0:-1,-1 |
|
42 | 0:-1,-1 1e4e1b8f71e0 1970-01-12 13:46 +0000 user | |
| 43 | line 1 |
|
43 | line 1 | |
| 44 |
|
44 | |||
| 45 | # error if style not readable |
|
45 | # error if style not readable | |
| 46 | abort: Permission denied - ./q |
|
46 | abort: Permission denied - ./q | |
| 47 | # error if no style |
|
47 | # error if no style | |
| 48 | abort: No such file or directory - notexist |
|
48 | abort: No such file or directory - notexist | |
| 49 | # error if style missing key |
|
49 | # error if style missing key | |
| 50 | abort: ./t: no key named 'changeset' |
|
50 | abort: ./t: no key named 'changeset' | |
| 51 | # error if include fails |
|
51 | # error if include fails | |
| 52 | abort: template file ./q: Permission denied |
|
52 | abort: template file ./q: Permission denied | |
| 53 | # include works |
|
53 | # include works | |
| 54 | 3 |
|
54 | 3 | |
| 55 | 2 |
|
55 | 2 | |
| 56 | 1 |
|
56 | 1 | |
| 57 | 0 |
|
57 | 0 | |
| 58 | # ui.style works |
|
58 | # ui.style works | |
| 59 | 3 |
|
59 | 3 | |
| 60 | 2 |
|
60 | 2 | |
| 61 | 1 |
|
61 | 1 | |
| 62 | 0 |
|
62 | 0 | |
| 63 | # keys work |
|
63 | # keys work | |
| 64 | author: person |
|
64 | author: person | |
| 65 | author: other@place |
|
65 | author: other@place | |
| 66 | author: A. N. Other <other@place> |
|
66 | author: A. N. Other <other@place> | |
| 67 | author: User Name <user@hostname> |
|
67 | author: User Name <user@hostname> | |
| 68 | author--verbose: person |
|
68 | author--verbose: person | |
| 69 | author--verbose: other@place |
|
69 | author--verbose: other@place | |
| 70 | author--verbose: A. N. Other <other@place> |
|
70 | author--verbose: A. N. Other <other@place> | |
| 71 | author--verbose: User Name <user@hostname> |
|
71 | author--verbose: User Name <user@hostname> | |
| 72 | author--debug: person |
|
72 | author--debug: person | |
| 73 | author--debug: other@place |
|
73 | author--debug: other@place | |
| 74 | author--debug: A. N. Other <other@place> |
|
74 | author--debug: A. N. Other <other@place> | |
| 75 | author--debug: User Name <user@hostname> |
|
75 | author--debug: User Name <user@hostname> | |
| 76 | branches: |
|
76 | branches: | |
| 77 | branches: |
|
77 | branches: | |
| 78 | branches: |
|
78 | branches: | |
| 79 | branches: |
|
79 | branches: | |
| 80 | branches--verbose: |
|
80 | branches--verbose: | |
| 81 | branches--verbose: |
|
81 | branches--verbose: | |
| 82 | branches--verbose: |
|
82 | branches--verbose: | |
| 83 | branches--verbose: |
|
83 | branches--verbose: | |
| 84 | branches--debug: |
|
84 | branches--debug: | |
| 85 | branches--debug: |
|
85 | branches--debug: | |
| 86 | branches--debug: |
|
86 | branches--debug: | |
| 87 | branches--debug: |
|
87 | branches--debug: | |
| 88 | date: 1300000.00 |
|
88 | date: 1300000.00 | |
| 89 | date: 1200000.00 |
|
89 | date: 1200000.00 | |
| 90 | date: 1100000.00 |
|
90 | date: 1100000.00 | |
| 91 | date: 1000000.00 |
|
91 | date: 1000000.00 | |
| 92 | date--verbose: 1300000.00 |
|
92 | date--verbose: 1300000.00 | |
| 93 | date--verbose: 1200000.00 |
|
93 | date--verbose: 1200000.00 | |
| 94 | date--verbose: 1100000.00 |
|
94 | date--verbose: 1100000.00 | |
| 95 | date--verbose: 1000000.00 |
|
95 | date--verbose: 1000000.00 | |
| 96 | date--debug: 1300000.00 |
|
96 | date--debug: 1300000.00 | |
| 97 | date--debug: 1200000.00 |
|
97 | date--debug: 1200000.00 | |
| 98 | date--debug: 1100000.00 |
|
98 | date--debug: 1100000.00 | |
| 99 | date--debug: 1000000.00 |
|
99 | date--debug: 1000000.00 | |
| 100 | desc: no user, no domain |
|
100 | desc: no user, no domain | |
| 101 | desc: no person |
|
101 | desc: no person | |
| 102 | desc: other 1 |
|
102 | desc: other 1 | |
| 103 | other 2 |
|
103 | other 2 | |
| 104 |
|
104 | |||
| 105 | other 3 |
|
105 | other 3 | |
| 106 |
|
||||
| 107 | desc: line 1 |
|
106 | desc: line 1 | |
| 108 | line 2 |
|
107 | line 2 | |
| 109 |
|
||||
| 110 | desc--verbose: no user, no domain |
|
108 | desc--verbose: no user, no domain | |
| 111 | desc--verbose: no person |
|
109 | desc--verbose: no person | |
| 112 | desc--verbose: other 1 |
|
110 | desc--verbose: other 1 | |
| 113 | other 2 |
|
111 | other 2 | |
| 114 |
|
112 | |||
| 115 | other 3 |
|
113 | other 3 | |
| 116 |
|
||||
| 117 | desc--verbose: line 1 |
|
114 | desc--verbose: line 1 | |
| 118 | line 2 |
|
115 | line 2 | |
| 119 |
|
||||
| 120 | desc--debug: no user, no domain |
|
116 | desc--debug: no user, no domain | |
| 121 | desc--debug: no person |
|
117 | desc--debug: no person | |
| 122 | desc--debug: other 1 |
|
118 | desc--debug: other 1 | |
| 123 | other 2 |
|
119 | other 2 | |
| 124 |
|
120 | |||
| 125 | other 3 |
|
121 | other 3 | |
| 126 |
|
||||
| 127 | desc--debug: line 1 |
|
122 | desc--debug: line 1 | |
| 128 | line 2 |
|
123 | line 2 | |
| 129 |
|
||||
| 130 | file_adds: |
|
124 | file_adds: | |
| 131 | file_adds: |
|
125 | file_adds: | |
| 132 | file_adds: |
|
126 | file_adds: | |
| 133 | file_adds: |
|
127 | file_adds: | |
| 134 | file_adds--verbose: |
|
128 | file_adds--verbose: | |
| 135 | file_adds--verbose: |
|
129 | file_adds--verbose: | |
| 136 | file_adds--verbose: |
|
130 | file_adds--verbose: | |
| 137 | file_adds--verbose: |
|
131 | file_adds--verbose: | |
| 138 | file_adds--debug: |
|
132 | file_adds--debug: | |
| 139 | file_adds--debug: c |
|
133 | file_adds--debug: c | |
| 140 | file_adds--debug: b |
|
134 | file_adds--debug: b | |
| 141 | file_adds--debug: a |
|
135 | file_adds--debug: a | |
| 142 | file_dels: |
|
136 | file_dels: | |
| 143 | file_dels: |
|
137 | file_dels: | |
| 144 | file_dels: |
|
138 | file_dels: | |
| 145 | file_dels: |
|
139 | file_dels: | |
| 146 | file_dels--verbose: |
|
140 | file_dels--verbose: | |
| 147 | file_dels--verbose: |
|
141 | file_dels--verbose: | |
| 148 | file_dels--verbose: |
|
142 | file_dels--verbose: | |
| 149 | file_dels--verbose: |
|
143 | file_dels--verbose: | |
| 150 | file_dels--debug: |
|
144 | file_dels--debug: | |
| 151 | file_dels--debug: |
|
145 | file_dels--debug: | |
| 152 | file_dels--debug: |
|
146 | file_dels--debug: | |
| 153 | file_dels--debug: |
|
147 | file_dels--debug: | |
| 154 | files: c |
|
148 | files: c | |
| 155 | files: c |
|
149 | files: c | |
| 156 | files: b |
|
150 | files: b | |
| 157 | files: a |
|
151 | files: a | |
| 158 | files--verbose: c |
|
152 | files--verbose: c | |
| 159 | files--verbose: c |
|
153 | files--verbose: c | |
| 160 | files--verbose: b |
|
154 | files--verbose: b | |
| 161 | files--verbose: a |
|
155 | files--verbose: a | |
| 162 | files--debug: c |
|
156 | files--debug: c | |
| 163 | files--debug: |
|
157 | files--debug: | |
| 164 | files--debug: |
|
158 | files--debug: | |
| 165 | files--debug: |
|
159 | files--debug: | |
| 166 | manifest: |
|
160 | manifest: | |
| 167 | manifest: |
|
161 | manifest: | |
| 168 | manifest: |
|
162 | manifest: | |
| 169 | manifest: |
|
163 | manifest: | |
| 170 | manifest--verbose: |
|
164 | manifest--verbose: | |
| 171 | manifest--verbose: |
|
165 | manifest--verbose: | |
| 172 | manifest--verbose: |
|
166 | manifest--verbose: | |
| 173 | manifest--verbose: |
|
167 | manifest--verbose: | |
| 174 | manifest--debug: 3:cb5a1327723b |
|
168 | manifest--debug: 3:cb5a1327723b | |
| 175 | manifest--debug: 2:6e0e82995c35 |
|
169 | manifest--debug: 2:6e0e82995c35 | |
| 176 | manifest--debug: 1:4e8d705b1e53 |
|
170 | manifest--debug: 1:4e8d705b1e53 | |
| 177 | manifest--debug: 0:a0c8bcbbb45c |
|
171 | manifest--debug: 0:a0c8bcbbb45c | |
| 178 | node: 8c7f028fbabf93fde80ef788885370b36abeff33 |
|
172 | node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
| 179 | node: 259081bc29d176c6ae17af5dd01a3440b3288c97 |
|
173 | node: 97054abb4ab824450e9164180baf491ae0078465 | |
| 180 | node: 1c37ba7745099d0f206b3a663abcfe127b037433 |
|
174 | node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
| 181 | node: 6eb5362d59ec784e4431d3e140c8cc6e1b77ce82 |
|
175 | node: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
| 182 | node--verbose: 8c7f028fbabf93fde80ef788885370b36abeff33 |
|
176 | node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
| 183 | node--verbose: 259081bc29d176c6ae17af5dd01a3440b3288c97 |
|
177 | node--verbose: 97054abb4ab824450e9164180baf491ae0078465 | |
| 184 | node--verbose: 1c37ba7745099d0f206b3a663abcfe127b037433 |
|
178 | node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
| 185 | node--verbose: 6eb5362d59ec784e4431d3e140c8cc6e1b77ce82 |
|
179 | node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
| 186 | node--debug: 8c7f028fbabf93fde80ef788885370b36abeff33 |
|
180 | node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
| 187 | node--debug: 259081bc29d176c6ae17af5dd01a3440b3288c97 |
|
181 | node--debug: 97054abb4ab824450e9164180baf491ae0078465 | |
| 188 | node--debug: 1c37ba7745099d0f206b3a663abcfe127b037433 |
|
182 | node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
| 189 | node--debug: 6eb5362d59ec784e4431d3e140c8cc6e1b77ce82 |
|
183 | node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
| 190 | parents: |
|
184 | parents: | |
| 191 | parents: |
|
185 | parents: | |
| 192 | parents: |
|
186 | parents: | |
| 193 | parents: |
|
187 | parents: | |
| 194 | parents--verbose: |
|
188 | parents--verbose: | |
| 195 | parents--verbose: |
|
189 | parents--verbose: | |
| 196 | parents--verbose: |
|
190 | parents--verbose: | |
| 197 | parents--verbose: |
|
191 | parents--verbose: | |
| 198 |
parents--debug: 2: |
|
192 | parents--debug: 2:97054abb4ab8 -1:000000000000 | |
| 199 |
parents--debug: 1: |
|
193 | parents--debug: 1:b608e9d1a3f0 -1:000000000000 | |
| 200 |
parents--debug: 0: |
|
194 | parents--debug: 0:1e4e1b8f71e0 -1:000000000000 | |
| 201 | parents--debug: -1:000000000000 -1:000000000000 |
|
195 | parents--debug: -1:000000000000 -1:000000000000 | |
| 202 | rev: 3 |
|
196 | rev: 3 | |
| 203 | rev: 2 |
|
197 | rev: 2 | |
| 204 | rev: 1 |
|
198 | rev: 1 | |
| 205 | rev: 0 |
|
199 | rev: 0 | |
| 206 | rev--verbose: 3 |
|
200 | rev--verbose: 3 | |
| 207 | rev--verbose: 2 |
|
201 | rev--verbose: 2 | |
| 208 | rev--verbose: 1 |
|
202 | rev--verbose: 1 | |
| 209 | rev--verbose: 0 |
|
203 | rev--verbose: 0 | |
| 210 | rev--debug: 3 |
|
204 | rev--debug: 3 | |
| 211 | rev--debug: 2 |
|
205 | rev--debug: 2 | |
| 212 | rev--debug: 1 |
|
206 | rev--debug: 1 | |
| 213 | rev--debug: 0 |
|
207 | rev--debug: 0 | |
| 214 | tags: tip |
|
208 | tags: tip | |
| 215 | tags: |
|
209 | tags: | |
| 216 | tags: |
|
210 | tags: | |
| 217 | tags: |
|
211 | tags: | |
| 218 | tags--verbose: tip |
|
212 | tags--verbose: tip | |
| 219 | tags--verbose: |
|
213 | tags--verbose: | |
| 220 | tags--verbose: |
|
214 | tags--verbose: | |
| 221 | tags--verbose: |
|
215 | tags--verbose: | |
| 222 | tags--debug: tip |
|
216 | tags--debug: tip | |
| 223 | tags--debug: |
|
217 | tags--debug: | |
| 224 | tags--debug: |
|
218 | tags--debug: | |
| 225 | tags--debug: |
|
219 | tags--debug: | |
| 226 | # filters work |
|
220 | # filters work | |
| 227 |
|
221 | |||
| 228 | place |
|
222 | place | |
| 229 | place |
|
223 | place | |
| 230 | hostname |
|
224 | hostname | |
| 231 | person |
|
225 | person | |
| 232 | other |
|
226 | other | |
| 233 | A. N. Other |
|
227 | A. N. Other | |
| 234 | User Name |
|
228 | User Name | |
| 235 | person |
|
229 | person | |
| 236 | other |
|
230 | other | |
| 237 | other |
|
231 | other | |
| 238 | user |
|
232 | user | |
| 239 | Fri Jan 16 01:06:40 1970 +0000 |
|
233 | Fri Jan 16 01:06:40 1970 +0000 | |
| 240 | Wed Jan 14 21:20:00 1970 +0000 |
|
234 | Wed Jan 14 21:20:00 1970 +0000 | |
| 241 | Tue Jan 13 17:33:20 1970 +0000 |
|
235 | Tue Jan 13 17:33:20 1970 +0000 | |
| 242 | Mon Jan 12 13:46:40 1970 +0000 |
|
236 | Mon Jan 12 13:46:40 1970 +0000 | |
| 243 | 1970-01-16 01:06 +0000 |
|
237 | 1970-01-16 01:06 +0000 | |
| 244 | 1970-01-14 21:20 +0000 |
|
238 | 1970-01-14 21:20 +0000 | |
| 245 | 1970-01-13 17:33 +0000 |
|
239 | 1970-01-13 17:33 +0000 | |
| 246 | 1970-01-12 13:46 +0000 |
|
240 | 1970-01-12 13:46 +0000 | |
| 247 | Fri, 16 Jan 1970 01:06:40 +0000 |
|
241 | Fri, 16 Jan 1970 01:06:40 +0000 | |
| 248 | Wed, 14 Jan 1970 21:20:00 +0000 |
|
242 | Wed, 14 Jan 1970 21:20:00 +0000 | |
| 249 | Tue, 13 Jan 1970 17:33:20 +0000 |
|
243 | Tue, 13 Jan 1970 17:33:20 +0000 | |
| 250 | Mon, 12 Jan 1970 13:46:40 +0000 |
|
244 | Mon, 12 Jan 1970 13:46:40 +0000 | |
| 251 | no user, no domain |
|
245 | no user, no domain | |
| 252 | no person |
|
246 | no person | |
| 253 | other 1 |
|
247 | other 1 | |
| 254 | line 1 |
|
248 | line 1 | |
| 255 | 8c7f028fbabf |
|
249 | 10e46f2dcbf4 | |
| 256 | 259081bc29d1 |
|
250 | 97054abb4ab8 | |
| 257 | 1c37ba774509 |
|
251 | b608e9d1a3f0 | |
| 258 | 6eb5362d59ec |
|
252 | 1e4e1b8f71e0 | |
| 259 | # error on syntax |
|
253 | # error on syntax | |
| 260 | abort: t:3: unmatched quotes |
|
254 | abort: t:3: unmatched quotes | |
| 261 | # done |
|
255 | # done | |
General Comments 0
You need to be logged in to leave comments.
Login now