##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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