Mercurial > evolve
comparison tests/test-evolve-obshistory-complex.t @ 3083:e91ca8b5ecf7
obsfate: use core version of obsfate if available
Let us use the upstream version whenever available. The operation display is
currently disabled to ease with the test changes.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Oct 2017 12:04:45 +0200 |
parents | 945a0989e41b |
children | 87b83a3e0392 b6ba296532cb |
comparison
equal
deleted
inserted
replaced
3082:326e0ee1eed1 | 3083:e91ca8b5ecf7 |
---|---|
97 | | | summary: fold0 | 97 | | | summary: fold0 |
98 | | | | 98 | | | |
99 x | | changeset: 4:868d2e0eb19c | 99 x | | changeset: 4:868d2e0eb19c |
100 | | | user: test | 100 | | | user: test |
101 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 101 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
102 | | | obsolete: rewritten as d15d0ffc75f6 | 102 | | | obsolete: rewritten as 8:d15d0ffc75f6 |
103 | | | summary: D | 103 | | | summary: D |
104 | | | | 104 | | | |
105 x | | changeset: 3:a8df460dbbfe | 105 x | | changeset: 3:a8df460dbbfe |
106 |/ / user: test | 106 |/ / user: test |
107 | | date: Thu Jan 01 00:00:00 1970 +0000 | 107 | | date: Thu Jan 01 00:00:00 1970 +0000 |
108 | | obsolete: rewritten as d15d0ffc75f6 | 108 | | obsolete: rewritten as 8:d15d0ffc75f6 |
109 | | summary: C | 109 | | summary: C |
110 | | | 110 | | |
111 x | changeset: 2:c473644ee0e9 | 111 x | changeset: 2:c473644ee0e9 |
112 | | user: test | 112 | | user: test |
113 | | date: Thu Jan 01 00:00:00 1970 +0000 | 113 | | date: Thu Jan 01 00:00:00 1970 +0000 |
114 | | obsolete: rewritten as b868bc49b0a4 | 114 | | obsolete: rewritten as 7:b868bc49b0a4 |
115 | | summary: B | 115 | | summary: B |
116 | | | 116 | | |
117 x | changeset: 1:2a34000d3544 | 117 x | changeset: 1:2a34000d3544 |
118 |/ user: test | 118 |/ user: test |
119 | date: Thu Jan 01 00:00:00 1970 +0000 | 119 | date: Thu Jan 01 00:00:00 1970 +0000 |
120 | obsolete: rewritten as b868bc49b0a4 | 120 | obsolete: rewritten as 7:b868bc49b0a4 |
121 | summary: A | 121 | summary: A |
122 | | 122 | |
123 o changeset: 0:ea207398892e | 123 o changeset: 0:ea207398892e |
124 user: test | 124 user: test |
125 date: Thu Jan 01 00:00:00 1970 +0000 | 125 date: Thu Jan 01 00:00:00 1970 +0000 |
271 | | | summary: fold0 | 271 | | | summary: fold0 |
272 | | | | 272 | | | |
273 x | | changeset: 4:868d2e0eb19c | 273 x | | changeset: 4:868d2e0eb19c |
274 | | | user: test | 274 | | | user: test |
275 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 275 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
276 | | | obsolete: split as 7b3290f6e0a0, d0f33db50670 | 276 | | | obsolete: split as 12:7b3290f6e0a0, 13:d0f33db50670 |
277 | | | summary: D | 277 | | | summary: D |
278 | | | | 278 | | | |
279 x | | changeset: 3:a8df460dbbfe | 279 x | | changeset: 3:a8df460dbbfe |
280 |/ / user: test | 280 |/ / user: test |
281 | | date: Thu Jan 01 00:00:00 1970 +0000 | 281 | | date: Thu Jan 01 00:00:00 1970 +0000 |
282 | | obsolete: split as 7b3290f6e0a0, d0f33db50670 | 282 | | obsolete: split as 12:7b3290f6e0a0, 13:d0f33db50670 |
283 | | summary: C | 283 | | summary: C |
284 | | | 284 | | |
285 x | changeset: 2:c473644ee0e9 | 285 x | changeset: 2:c473644ee0e9 |
286 | | user: test | 286 | | user: test |
287 | | date: Thu Jan 01 00:00:00 1970 +0000 | 287 | | date: Thu Jan 01 00:00:00 1970 +0000 |
288 | | obsolete: split as 19e14c8397fc, e036916b63ea | 288 | | obsolete: split as 10:19e14c8397fc, 11:e036916b63ea |
289 | | summary: B | 289 | | summary: B |
290 | | | 290 | | |
291 x | changeset: 1:2a34000d3544 | 291 x | changeset: 1:2a34000d3544 |
292 |/ user: test | 292 |/ user: test |
293 | date: Thu Jan 01 00:00:00 1970 +0000 | 293 | date: Thu Jan 01 00:00:00 1970 +0000 |
294 | obsolete: split as 19e14c8397fc, e036916b63ea | 294 | obsolete: split as 10:19e14c8397fc, 11:e036916b63ea |
295 | summary: A | 295 | summary: A |
296 | | 296 | |
297 o changeset: 0:ea207398892e | 297 o changeset: 0:ea207398892e |
298 user: test | 298 user: test |
299 date: Thu Jan 01 00:00:00 1970 +0000 | 299 date: Thu Jan 01 00:00:00 1970 +0000 |
336 | | | summary: fold0 | 336 | | | summary: fold0 |
337 | | | | 337 | | | |
338 x | | changeset: 4:868d2e0eb19c | 338 x | | changeset: 4:868d2e0eb19c |
339 | | | user: test | 339 | | | user: test |
340 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 340 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
341 | | | obsolete: split as 7b3290f6e0a0, ec31316faa9d | 341 | | | obsolete: split as 12:7b3290f6e0a0, 14:ec31316faa9d |
342 | | | summary: D | 342 | | | summary: D |
343 | | | | 343 | | | |
344 x | | changeset: 3:a8df460dbbfe | 344 x | | changeset: 3:a8df460dbbfe |
345 |/ / user: test | 345 |/ / user: test |
346 | | date: Thu Jan 01 00:00:00 1970 +0000 | 346 | | date: Thu Jan 01 00:00:00 1970 +0000 |
347 | | obsolete: split as 7b3290f6e0a0, ec31316faa9d | 347 | | obsolete: split as 12:7b3290f6e0a0, 14:ec31316faa9d |
348 | | summary: C | 348 | | summary: C |
349 | | | 349 | | |
350 x | changeset: 2:c473644ee0e9 | 350 x | changeset: 2:c473644ee0e9 |
351 | | user: test | 351 | | user: test |
352 | | date: Thu Jan 01 00:00:00 1970 +0000 | 352 | | date: Thu Jan 01 00:00:00 1970 +0000 |
353 | | obsolete: split as 19e14c8397fc, 7b3290f6e0a0 | 353 | | obsolete: split as 10:19e14c8397fc, 12:7b3290f6e0a0 |
354 | | summary: B | 354 | | summary: B |
355 | | | 355 | | |
356 x | changeset: 1:2a34000d3544 | 356 x | changeset: 1:2a34000d3544 |
357 |/ user: test | 357 |/ user: test |
358 | date: Thu Jan 01 00:00:00 1970 +0000 | 358 | date: Thu Jan 01 00:00:00 1970 +0000 |
359 | obsolete: split as 19e14c8397fc, 7b3290f6e0a0 | 359 | obsolete: split as 10:19e14c8397fc, 12:7b3290f6e0a0 |
360 | summary: A | 360 | summary: A |
361 | | 361 | |
362 o changeset: 0:ea207398892e | 362 o changeset: 0:ea207398892e |
363 user: test | 363 user: test |
364 date: Thu Jan 01 00:00:00 1970 +0000 | 364 date: Thu Jan 01 00:00:00 1970 +0000 |