Mercurial > evolve
comparison tests/test-evolve-obshistory-complex.t @ 3287:4303a46b4167 mercurial-4.3
test-compat: merge stable into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 11 Dec 2017 16:32:03 +0100 |
| parents | 73b4e84df0bd a867d59ea97a |
| children | b714709afe6a 85cdce113c2c |
comparison
equal
deleted
inserted
replaced
| 3286:76c447d88d9a | 3287:4303a46b4167 |
|---|---|
| 66 Split commits two by two | 66 Split commits two by two |
| 67 ------------------------ | 67 ------------------------ |
| 68 | 68 |
| 69 $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0" | 69 $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0" |
| 70 2 changesets folded | 70 2 changesets folded |
| 71 4 new orphan changesets | 71 4 new unstable changesets |
| 72 $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1" | 72 $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1" |
| 73 2 changesets folded | 73 2 changesets folded |
| 74 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test" | 74 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test" |
| 75 current hg version does not support storing note in obsmarker | |
| 75 2 changesets folded | 76 2 changesets folded |
| 76 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 |
| 77 $ hg obslog -r . | 78 $ hg obslog -r . |
| 78 @ 100cc25b765f (9) fold2 | 79 @ 100cc25b765f (9) fold2 |
| 79 |\ | 80 |\ |
| 89 @ changeset: 9:100cc25b765f | 90 @ changeset: 9:100cc25b765f |
| 90 | tag: tip | 91 | tag: tip |
| 91 | parent: 4:868d2e0eb19c | 92 | parent: 4:868d2e0eb19c |
| 92 | user: test | 93 | user: test |
| 93 | date: Thu Jan 01 00:00:00 1970 +0000 | 94 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 94 | instability: orphan | 95 | trouble: unstable |
| 95 | summary: fold2 | 96 | summary: fold2 |
| 96 | | 97 | |
| 97 | o changeset: 8:d15d0ffc75f6 | 98 | o changeset: 8:d15d0ffc75f6 |
| 98 | | parent: 2:c473644ee0e9 | 99 | | parent: 2:c473644ee0e9 |
| 99 | | user: test | 100 | | user: test |
| 100 | | date: Thu Jan 01 00:00:00 1970 +0000 | 101 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 101 | | instability: orphan | 102 | | trouble: unstable |
| 102 | | summary: fold1 | 103 | | summary: fold1 |
| 103 | | | 104 | | |
| 104 | | o changeset: 7:b868bc49b0a4 | 105 | | o changeset: 7:b868bc49b0a4 |
| 105 | | | parent: 0:ea207398892e | 106 | | | parent: 0:ea207398892e |
| 106 | | | user: test | 107 | | | user: test |
| 108 | | | summary: fold0 | 109 | | | summary: fold0 |
| 109 | | | | 110 | | | |
| 110 x | | changeset: 4:868d2e0eb19c | 111 x | | changeset: 4:868d2e0eb19c |
| 111 | | | user: test | 112 | | | user: test |
| 112 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 113 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 113 | | | obsolete: rewritten as 8:d15d0ffc75f6 | 114 | | | obsolete: rewritten as d15d0ffc75f6 |
| 114 | | | summary: D | 115 | | | summary: D |
| 115 | | | | 116 | | | |
| 116 x | | changeset: 3:a8df460dbbfe | 117 x | | changeset: 3:a8df460dbbfe |
| 117 |/ / user: test | 118 |/ / user: test |
| 118 | | date: Thu Jan 01 00:00:00 1970 +0000 | 119 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 119 | | obsolete: rewritten as 8:d15d0ffc75f6 | 120 | | obsolete: rewritten as d15d0ffc75f6 |
| 120 | | summary: C | 121 | | summary: C |
| 121 | | | 122 | | |
| 122 x | changeset: 2:c473644ee0e9 | 123 x | changeset: 2:c473644ee0e9 |
| 123 | | user: test | 124 | | user: test |
| 124 | | date: Thu Jan 01 00:00:00 1970 +0000 | 125 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 125 | | obsolete: rewritten as 7:b868bc49b0a4 | 126 | | obsolete: rewritten as b868bc49b0a4 |
| 126 | | summary: B | 127 | | summary: B |
| 127 | | | 128 | | |
| 128 x | changeset: 1:2a34000d3544 | 129 x | changeset: 1:2a34000d3544 |
| 129 |/ user: test | 130 |/ user: test |
| 130 | date: Thu Jan 01 00:00:00 1970 +0000 | 131 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 131 | obsolete: rewritten as 7:b868bc49b0a4 | 132 | obsolete: rewritten as b868bc49b0a4 |
| 132 | summary: A | 133 | summary: A |
| 133 | | 134 | |
| 134 o changeset: 0:ea207398892e | 135 o changeset: 0:ea207398892e |
| 135 user: test | 136 user: test |
| 136 date: Thu Jan 01 00:00:00 1970 +0000 | 137 date: Thu Jan 01 00:00:00 1970 +0000 |
| 245 $ hg log -G | 246 $ hg log -G |
| 246 @ changeset: 15:d4a000f63ee9 | 247 @ changeset: 15:d4a000f63ee9 |
| 247 | tag: tip | 248 | tag: tip |
| 248 | user: test | 249 | user: test |
| 249 | date: Thu Jan 01 00:00:00 1970 +0000 | 250 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 250 | instability: orphan | 251 | trouble: unstable |
| 251 | summary: fold2 | 252 | summary: fold2 |
| 252 | | 253 | |
| 253 o changeset: 14:ec31316faa9d | 254 o changeset: 14:ec31316faa9d |
| 254 | parent: 4:868d2e0eb19c | 255 | parent: 4:868d2e0eb19c |
| 255 | user: test | 256 | user: test |
| 256 | date: Thu Jan 01 00:00:00 1970 +0000 | 257 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 257 | instability: orphan | 258 | trouble: unstable |
| 258 | summary: fold2 | 259 | summary: fold2 |
| 259 | | 260 | |
| 260 | o changeset: 13:d0f33db50670 | 261 | o changeset: 13:d0f33db50670 |
| 261 | | user: test | 262 | | user: test |
| 262 | | date: Thu Jan 01 00:00:00 1970 +0000 | 263 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 263 | | instability: orphan | 264 | | trouble: unstable |
| 264 | | summary: fold1 | 265 | | summary: fold1 |
| 265 | | | 266 | | |
| 266 | o changeset: 12:7b3290f6e0a0 | 267 | o changeset: 12:7b3290f6e0a0 |
| 267 | | parent: 2:c473644ee0e9 | 268 | | parent: 2:c473644ee0e9 |
| 268 | | user: test | 269 | | user: test |
| 269 | | date: Thu Jan 01 00:00:00 1970 +0000 | 270 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 270 | | instability: orphan | 271 | | trouble: unstable |
| 271 | | summary: fold1 | 272 | | summary: fold1 |
| 272 | | | 273 | | |
| 273 | | o changeset: 11:e036916b63ea | 274 | | o changeset: 11:e036916b63ea |
| 274 | | | user: test | 275 | | | user: test |
| 275 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 276 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 282 | | | summary: fold0 | 283 | | | summary: fold0 |
| 283 | | | | 284 | | | |
| 284 x | | changeset: 4:868d2e0eb19c | 285 x | | changeset: 4:868d2e0eb19c |
| 285 | | | user: test | 286 | | | user: test |
| 286 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 287 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 287 | | | obsolete: split as 12:7b3290f6e0a0, 13:d0f33db50670 | 288 | | | obsolete: split as 7b3290f6e0a0, d0f33db50670 |
| 288 | | | summary: D | 289 | | | summary: D |
| 289 | | | | 290 | | | |
| 290 x | | changeset: 3:a8df460dbbfe | 291 x | | changeset: 3:a8df460dbbfe |
| 291 |/ / user: test | 292 |/ / user: test |
| 292 | | date: Thu Jan 01 00:00:00 1970 +0000 | 293 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 293 | | obsolete: split as 12:7b3290f6e0a0, 13:d0f33db50670 | 294 | | obsolete: split as 7b3290f6e0a0, d0f33db50670 |
| 294 | | summary: C | 295 | | summary: C |
| 295 | | | 296 | | |
| 296 x | changeset: 2:c473644ee0e9 | 297 x | changeset: 2:c473644ee0e9 |
| 297 | | user: test | 298 | | user: test |
| 298 | | date: Thu Jan 01 00:00:00 1970 +0000 | 299 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 299 | | obsolete: split as 10:19e14c8397fc, 11:e036916b63ea | 300 | | obsolete: split as 19e14c8397fc, e036916b63ea |
| 300 | | summary: B | 301 | | summary: B |
| 301 | | | 302 | | |
| 302 x | changeset: 1:2a34000d3544 | 303 x | changeset: 1:2a34000d3544 |
| 303 |/ user: test | 304 |/ user: test |
| 304 | date: Thu Jan 01 00:00:00 1970 +0000 | 305 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 305 | obsolete: split as 10:19e14c8397fc, 11:e036916b63ea | 306 | obsolete: split as 19e14c8397fc, e036916b63ea |
| 306 | summary: A | 307 | summary: A |
| 307 | | 308 | |
| 308 o changeset: 0:ea207398892e | 309 o changeset: 0:ea207398892e |
| 309 user: test | 310 user: test |
| 310 date: Thu Jan 01 00:00:00 1970 +0000 | 311 date: Thu Jan 01 00:00:00 1970 +0000 |
| 315 ---------------- | 316 ---------------- |
| 316 | 317 |
| 317 $ hg prune -s 12 -r 11 | 318 $ hg prune -s 12 -r 11 |
| 318 1 changesets pruned | 319 1 changesets pruned |
| 319 $ hg prune -s 14 -r 13 -n "this is a note stored in obsmarker in prune" | 320 $ hg prune -s 14 -r 13 -n "this is a note stored in obsmarker in prune" |
| 321 current hg version does not support storing note in obsmarker | |
| 320 1 changesets pruned | 322 1 changesets pruned |
| 321 $ hg log -G | 323 $ hg log -G |
| 322 @ changeset: 15:d4a000f63ee9 | 324 @ changeset: 15:d4a000f63ee9 |
| 323 | tag: tip | 325 | tag: tip |
| 324 | user: test | 326 | user: test |
| 325 | date: Thu Jan 01 00:00:00 1970 +0000 | 327 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 326 | instability: orphan | 328 | trouble: unstable |
| 327 | summary: fold2 | 329 | summary: fold2 |
| 328 | | 330 | |
| 329 o changeset: 14:ec31316faa9d | 331 o changeset: 14:ec31316faa9d |
| 330 | parent: 4:868d2e0eb19c | 332 | parent: 4:868d2e0eb19c |
| 331 | user: test | 333 | user: test |
| 332 | date: Thu Jan 01 00:00:00 1970 +0000 | 334 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 333 | instability: orphan | 335 | trouble: unstable |
| 334 | summary: fold2 | 336 | summary: fold2 |
| 335 | | 337 | |
| 336 | o changeset: 12:7b3290f6e0a0 | 338 | o changeset: 12:7b3290f6e0a0 |
| 337 | | parent: 2:c473644ee0e9 | 339 | | parent: 2:c473644ee0e9 |
| 338 | | user: test | 340 | | user: test |
| 339 | | date: Thu Jan 01 00:00:00 1970 +0000 | 341 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 340 | | instability: orphan | 342 | | trouble: unstable |
| 341 | | summary: fold1 | 343 | | summary: fold1 |
| 342 | | | 344 | | |
| 343 | | o changeset: 10:19e14c8397fc | 345 | | o changeset: 10:19e14c8397fc |
| 344 | | | parent: 0:ea207398892e | 346 | | | parent: 0:ea207398892e |
| 345 | | | user: test | 347 | | | user: test |
| 347 | | | summary: fold0 | 349 | | | summary: fold0 |
| 348 | | | | 350 | | | |
| 349 x | | changeset: 4:868d2e0eb19c | 351 x | | changeset: 4:868d2e0eb19c |
| 350 | | | user: test | 352 | | | user: test |
| 351 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 353 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 352 | | | obsolete: split as 12:7b3290f6e0a0, 14:ec31316faa9d | 354 | | | obsolete: split as 7b3290f6e0a0, ec31316faa9d |
| 353 | | | summary: D | 355 | | | summary: D |
| 354 | | | | 356 | | | |
| 355 x | | changeset: 3:a8df460dbbfe | 357 x | | changeset: 3:a8df460dbbfe |
| 356 |/ / user: test | 358 |/ / user: test |
| 357 | | date: Thu Jan 01 00:00:00 1970 +0000 | 359 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 358 | | obsolete: split as 12:7b3290f6e0a0, 14:ec31316faa9d | 360 | | obsolete: split as 7b3290f6e0a0, ec31316faa9d |
| 359 | | summary: C | 361 | | summary: C |
| 360 | | | 362 | | |
| 361 x | changeset: 2:c473644ee0e9 | 363 x | changeset: 2:c473644ee0e9 |
| 362 | | user: test | 364 | | user: test |
| 363 | | date: Thu Jan 01 00:00:00 1970 +0000 | 365 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 364 | | obsolete: split as 10:19e14c8397fc, 12:7b3290f6e0a0 | 366 | | obsolete: split as 19e14c8397fc, 7b3290f6e0a0 |
| 365 | | summary: B | 367 | | summary: B |
| 366 | | | 368 | | |
| 367 x | changeset: 1:2a34000d3544 | 369 x | changeset: 1:2a34000d3544 |
| 368 |/ user: test | 370 |/ user: test |
| 369 | date: Thu Jan 01 00:00:00 1970 +0000 | 371 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 370 | obsolete: split as 10:19e14c8397fc, 12:7b3290f6e0a0 | 372 | obsolete: split as 19e14c8397fc, 7b3290f6e0a0 |
| 371 | summary: A | 373 | summary: A |
| 372 | | 374 | |
| 373 o changeset: 0:ea207398892e | 375 o changeset: 0:ea207398892e |
| 374 user: test | 376 user: test |
| 375 date: Thu Jan 01 00:00:00 1970 +0000 | 377 date: Thu Jan 01 00:00:00 1970 +0000 |