Mercurial > evolve
comparison tests/test-evolve-obshistory-complex.t @ 3288:b714709afe6a mercurial-4.2
test-compat: merge mercurial-4.3 into mercurial-4.2
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 11 Dec 2017 18:30:14 +0100 |
| parents | 4303a46b4167 9c9c8c1eeb93 |
| children | 1e2f683e11e7 |
comparison
equal
deleted
inserted
replaced
| 3287:4303a46b4167 | 3288:b714709afe6a |
|---|---|
| 77 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 77 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 78 $ hg obslog -r . | 78 $ hg obslog -r . |
| 79 @ 100cc25b765f (9) fold2 | 79 @ 100cc25b765f (9) fold2 |
| 80 |\ | 80 |\ |
| 81 x | 0da815c333f6 (5) E | 81 x | 0da815c333f6 (5) E |
| 82 / rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) | 82 / rewritten(description, content) as 100cc25b765f by test (*) (glob) |
| 83 | note: folding changesets to test | 83 | note: folding changesets to test |
| 84 | | 84 | |
| 85 x d9f908fde1a1 (6) F | 85 x d9f908fde1a1 (6) F |
| 86 rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) | 86 rewritten(description, parent, content) as 100cc25b765f by test (*) (glob) |
| 87 note: folding changesets to test | 87 note: folding changesets to test |
| 88 | 88 |
| 89 $ hg log -G | 89 $ hg log -G |
| 90 @ changeset: 9:100cc25b765f | 90 @ changeset: 9:100cc25b765f |
| 91 | tag: tip | 91 | tag: tip |
| 109 | | | summary: fold0 | 109 | | | summary: fold0 |
| 110 | | | | 110 | | | |
| 111 x | | changeset: 4:868d2e0eb19c | 111 x | | changeset: 4:868d2e0eb19c |
| 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 d15d0ffc75f6 | |
| 115 | | | summary: D | 114 | | | summary: D |
| 116 | | | | 115 | | | |
| 117 x | | changeset: 3:a8df460dbbfe | 116 x | | changeset: 3:a8df460dbbfe |
| 118 |/ / user: test | 117 |/ / user: test |
| 119 | | date: Thu Jan 01 00:00:00 1970 +0000 | 118 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 120 | | obsolete: rewritten as d15d0ffc75f6 | |
| 121 | | summary: C | 119 | | summary: C |
| 122 | | | 120 | | |
| 123 x | changeset: 2:c473644ee0e9 | 121 x | changeset: 2:c473644ee0e9 |
| 124 | | user: test | 122 | | user: test |
| 125 | | date: Thu Jan 01 00:00:00 1970 +0000 | 123 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 126 | | obsolete: rewritten as b868bc49b0a4 | |
| 127 | | summary: B | 124 | | summary: B |
| 128 | | | 125 | | |
| 129 x | changeset: 1:2a34000d3544 | 126 x | changeset: 1:2a34000d3544 |
| 130 |/ user: test | 127 |/ user: test |
| 131 | date: Thu Jan 01 00:00:00 1970 +0000 | 128 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 132 | obsolete: rewritten as b868bc49b0a4 | |
| 133 | summary: A | 129 | summary: A |
| 134 | | 130 | |
| 135 o changeset: 0:ea207398892e | 131 o changeset: 0:ea207398892e |
| 136 user: test | 132 user: test |
| 137 date: Thu Jan 01 00:00:00 1970 +0000 | 133 date: Thu Jan 01 00:00:00 1970 +0000 |
| 283 | | | summary: fold0 | 279 | | | summary: fold0 |
| 284 | | | | 280 | | | |
| 285 x | | changeset: 4:868d2e0eb19c | 281 x | | changeset: 4:868d2e0eb19c |
| 286 | | | user: test | 282 | | | user: test |
| 287 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 283 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 288 | | | obsolete: split as 7b3290f6e0a0, d0f33db50670 | |
| 289 | | | summary: D | 284 | | | summary: D |
| 290 | | | | 285 | | | |
| 291 x | | changeset: 3:a8df460dbbfe | 286 x | | changeset: 3:a8df460dbbfe |
| 292 |/ / user: test | 287 |/ / user: test |
| 293 | | date: Thu Jan 01 00:00:00 1970 +0000 | 288 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 294 | | obsolete: split as 7b3290f6e0a0, d0f33db50670 | |
| 295 | | summary: C | 289 | | summary: C |
| 296 | | | 290 | | |
| 297 x | changeset: 2:c473644ee0e9 | 291 x | changeset: 2:c473644ee0e9 |
| 298 | | user: test | 292 | | user: test |
| 299 | | date: Thu Jan 01 00:00:00 1970 +0000 | 293 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 300 | | obsolete: split as 19e14c8397fc, e036916b63ea | |
| 301 | | summary: B | 294 | | summary: B |
| 302 | | | 295 | | |
| 303 x | changeset: 1:2a34000d3544 | 296 x | changeset: 1:2a34000d3544 |
| 304 |/ user: test | 297 |/ user: test |
| 305 | date: Thu Jan 01 00:00:00 1970 +0000 | 298 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 306 | obsolete: split as 19e14c8397fc, e036916b63ea | |
| 307 | summary: A | 299 | summary: A |
| 308 | | 300 | |
| 309 o changeset: 0:ea207398892e | 301 o changeset: 0:ea207398892e |
| 310 user: test | 302 user: test |
| 311 date: Thu Jan 01 00:00:00 1970 +0000 | 303 date: Thu Jan 01 00:00:00 1970 +0000 |
| 349 | | | summary: fold0 | 341 | | | summary: fold0 |
| 350 | | | | 342 | | | |
| 351 x | | changeset: 4:868d2e0eb19c | 343 x | | changeset: 4:868d2e0eb19c |
| 352 | | | user: test | 344 | | | user: test |
| 353 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 345 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 354 | | | obsolete: split as 7b3290f6e0a0, ec31316faa9d | |
| 355 | | | summary: D | 346 | | | summary: D |
| 356 | | | | 347 | | | |
| 357 x | | changeset: 3:a8df460dbbfe | 348 x | | changeset: 3:a8df460dbbfe |
| 358 |/ / user: test | 349 |/ / user: test |
| 359 | | date: Thu Jan 01 00:00:00 1970 +0000 | 350 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 360 | | obsolete: split as 7b3290f6e0a0, ec31316faa9d | |
| 361 | | summary: C | 351 | | summary: C |
| 362 | | | 352 | | |
| 363 x | changeset: 2:c473644ee0e9 | 353 x | changeset: 2:c473644ee0e9 |
| 364 | | user: test | 354 | | user: test |
| 365 | | date: Thu Jan 01 00:00:00 1970 +0000 | 355 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 366 | | obsolete: split as 19e14c8397fc, 7b3290f6e0a0 | |
| 367 | | summary: B | 356 | | summary: B |
| 368 | | | 357 | | |
| 369 x | changeset: 1:2a34000d3544 | 358 x | changeset: 1:2a34000d3544 |
| 370 |/ user: test | 359 |/ user: test |
| 371 | date: Thu Jan 01 00:00:00 1970 +0000 | 360 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 372 | obsolete: split as 19e14c8397fc, 7b3290f6e0a0 | |
| 373 | summary: A | 361 | summary: A |
| 374 | | 362 | |
| 375 o changeset: 0:ea207398892e | 363 o changeset: 0:ea207398892e |
| 376 user: test | 364 user: test |
| 377 date: Thu Jan 01 00:00:00 1970 +0000 | 365 date: Thu Jan 01 00:00:00 1970 +0000 |