equal
deleted
inserted
replaced
80 ----------- |
80 ----------- |
81 |
81 |
82 Check that debugobshistory on the divergent revision show both destinations |
82 Check that debugobshistory on the divergent revision show both destinations |
83 $ hg obslog --hidden 471f378eab4c --patch |
83 $ hg obslog --hidden 471f378eab4c --patch |
84 x 471f378eab4c (1) A0 |
84 x 471f378eab4c (1) A0 |
85 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
85 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
86 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
86 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
87 --- a/changeset-description |
87 --- a/changeset-description |
88 +++ b/changeset-description |
88 +++ b/changeset-description |
89 @@ -1,1 +1,1 @@ |
89 @@ -1,1 +1,1 @@ |
90 -A0 |
90 -A0 |
91 +A2 |
91 +A2 |
92 |
92 |
93 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
93 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
94 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
94 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
95 --- a/changeset-description |
95 --- a/changeset-description |
96 +++ b/changeset-description |
96 +++ b/changeset-description |
97 @@ -1,1 +1,1 @@ |
97 @@ -1,1 +1,1 @@ |
98 -A0 |
98 -A0 |
105 @ 65b757b745b9 (3) A2 |
105 @ 65b757b745b9 (3) A2 |
106 | |
106 | |
107 | * fdf9bde5129a (2) A1 |
107 | * fdf9bde5129a (2) A1 |
108 |/ |
108 |/ |
109 x 471f378eab4c (1) A0 |
109 x 471f378eab4c (1) A0 |
110 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
110 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
111 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
111 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
112 --- a/changeset-description |
112 --- a/changeset-description |
113 +++ b/changeset-description |
113 +++ b/changeset-description |
114 @@ -1,1 +1,1 @@ |
114 @@ -1,1 +1,1 @@ |
115 -A0 |
115 -A0 |
116 +A2 |
116 +A2 |
117 |
117 |
118 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
118 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
119 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
119 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
120 --- a/changeset-description |
120 --- a/changeset-description |
121 +++ b/changeset-description |
121 +++ b/changeset-description |
122 @@ -1,1 +1,1 @@ |
122 @@ -1,1 +1,1 @@ |
123 -A0 |
123 -A0 |
139 "operation": "amend", |
139 "operation": "amend", |
140 "succnodes": [ |
140 "succnodes": [ |
141 "65b757b745b935093c87a2bccd877521cccffcbd" |
141 "65b757b745b935093c87a2bccd877521cccffcbd" |
142 ], |
142 ], |
143 "user": "test", |
143 "user": "test", |
144 "verb": "rewritten" |
144 "verb": "reworded" |
145 }, |
145 }, |
146 { |
146 { |
147 "date": [ |
147 "date": [ |
148 *, (glob) |
148 *, (glob) |
149 0 (glob) |
149 0 (glob) |
154 "operation": "amend", |
154 "operation": "amend", |
155 "succnodes": [ |
155 "succnodes": [ |
156 "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e" |
156 "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e" |
157 ], |
157 ], |
158 "user": "test", |
158 "user": "test", |
159 "verb": "rewritten" |
159 "verb": "reworded" |
160 } |
160 } |
161 ], |
161 ], |
162 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
162 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
163 "shortdescription": "A0" |
163 "shortdescription": "A0" |
164 } |
164 } |
167 and the diverent one |
167 and the diverent one |
168 $ hg obslog fdf9bde5129a --patch |
168 $ hg obslog fdf9bde5129a --patch |
169 * fdf9bde5129a (2) A1 |
169 * fdf9bde5129a (2) A1 |
170 | |
170 | |
171 x 471f378eab4c (1) A0 |
171 x 471f378eab4c (1) A0 |
172 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
172 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
173 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
173 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
174 --- a/changeset-description |
174 --- a/changeset-description |
175 +++ b/changeset-description |
175 +++ b/changeset-description |
176 @@ -1,1 +1,1 @@ |
176 @@ -1,1 +1,1 @@ |
177 -A0 |
177 -A0 |
178 +A2 |
178 +A2 |
179 |
179 |
180 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
180 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
181 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
181 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
182 --- a/changeset-description |
182 --- a/changeset-description |
183 +++ b/changeset-description |
183 +++ b/changeset-description |
184 @@ -1,1 +1,1 @@ |
184 @@ -1,1 +1,1 @@ |
185 -A0 |
185 -A0 |
192 @ 65b757b745b9 (3) A2 |
192 @ 65b757b745b9 (3) A2 |
193 | |
193 | |
194 | * fdf9bde5129a (2) A1 |
194 | * fdf9bde5129a (2) A1 |
195 |/ |
195 |/ |
196 x 471f378eab4c (1) A0 |
196 x 471f378eab4c (1) A0 |
197 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
197 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
198 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
198 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
199 --- a/changeset-description |
199 --- a/changeset-description |
200 +++ b/changeset-description |
200 +++ b/changeset-description |
201 @@ -1,1 +1,1 @@ |
201 @@ -1,1 +1,1 @@ |
202 -A0 |
202 -A0 |
203 +A2 |
203 +A2 |
204 |
204 |
205 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
205 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
206 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
206 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
207 --- a/changeset-description |
207 --- a/changeset-description |
208 +++ b/changeset-description |
208 +++ b/changeset-description |
209 @@ -1,1 +1,1 @@ |
209 @@ -1,1 +1,1 @@ |
210 -A0 |
210 -A0 |
215 and the diverent one |
215 and the diverent one |
216 $ hg obslog 65b757b745b9 --patch |
216 $ hg obslog 65b757b745b9 --patch |
217 @ 65b757b745b9 (3) A2 |
217 @ 65b757b745b9 (3) A2 |
218 | |
218 | |
219 x 471f378eab4c (1) A0 |
219 x 471f378eab4c (1) A0 |
220 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
220 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
221 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
221 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
222 --- a/changeset-description |
222 --- a/changeset-description |
223 +++ b/changeset-description |
223 +++ b/changeset-description |
224 @@ -1,1 +1,1 @@ |
224 @@ -1,1 +1,1 @@ |
225 -A0 |
225 -A0 |
226 +A2 |
226 +A2 |
227 |
227 |
228 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
228 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
229 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
229 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
230 --- a/changeset-description |
230 --- a/changeset-description |
231 +++ b/changeset-description |
231 +++ b/changeset-description |
232 @@ -1,1 +1,1 @@ |
232 @@ -1,1 +1,1 @@ |
233 -A0 |
233 -A0 |
239 @ 65b757b745b9 (3) A2 |
239 @ 65b757b745b9 (3) A2 |
240 | |
240 | |
241 | * fdf9bde5129a (2) A1 |
241 | * fdf9bde5129a (2) A1 |
242 |/ |
242 |/ |
243 x 471f378eab4c (1) A0 |
243 x 471f378eab4c (1) A0 |
244 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
244 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
245 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
245 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
246 --- a/changeset-description |
246 --- a/changeset-description |
247 +++ b/changeset-description |
247 +++ b/changeset-description |
248 @@ -1,1 +1,1 @@ |
248 @@ -1,1 +1,1 @@ |
249 -A0 |
249 -A0 |
250 +A2 |
250 +A2 |
251 |
251 |
252 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
252 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
253 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
253 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
254 --- a/changeset-description |
254 --- a/changeset-description |
255 +++ b/changeset-description |
255 +++ b/changeset-description |
256 @@ -1,1 +1,1 @@ |
256 @@ -1,1 +1,1 @@ |
257 -A0 |
257 -A0 |
264 @ 65b757b745b9 (3) A2 |
264 @ 65b757b745b9 (3) A2 |
265 | |
265 | |
266 | * fdf9bde5129a (2) A1 |
266 | * fdf9bde5129a (2) A1 |
267 |/ |
267 |/ |
268 x 471f378eab4c (1) A0 |
268 x 471f378eab4c (1) A0 |
269 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
269 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
270 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
270 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
271 --- a/changeset-description |
271 --- a/changeset-description |
272 +++ b/changeset-description |
272 +++ b/changeset-description |
273 @@ -1,1 +1,1 @@ |
273 @@ -1,1 +1,1 @@ |
274 -A0 |
274 -A0 |
275 +A2 |
275 +A2 |
276 |
276 |
277 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
277 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
278 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
278 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
279 --- a/changeset-description |
279 --- a/changeset-description |
280 +++ b/changeset-description |
280 +++ b/changeset-description |
281 @@ -1,1 +1,1 @@ |
281 @@ -1,1 +1,1 @@ |
282 -A0 |
282 -A0 |
303 "operation": "amend", |
303 "operation": "amend", |
304 "succnodes": [ |
304 "succnodes": [ |
305 "65b757b745b935093c87a2bccd877521cccffcbd" |
305 "65b757b745b935093c87a2bccd877521cccffcbd" |
306 ], |
306 ], |
307 "user": "test", |
307 "user": "test", |
308 "verb": "rewritten" |
308 "verb": "reworded" |
309 }, |
309 }, |
310 { |
310 { |
311 "date": [ |
311 "date": [ |
312 *, (glob) |
312 *, (glob) |
313 0 (glob) |
313 0 (glob) |
318 "operation": "amend", |
318 "operation": "amend", |
319 "succnodes": [ |
319 "succnodes": [ |
320 "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e" |
320 "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e" |
321 ], |
321 ], |
322 "user": "test", |
322 "user": "test", |
323 "verb": "rewritten" |
323 "verb": "reworded" |
324 } |
324 } |
325 ], |
325 ], |
326 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
326 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
327 "shortdescription": "A0" |
327 "shortdescription": "A0" |
328 }, |
328 }, |