Mercurial > evolve
comparison tests/test-evolve-templates.t @ 3567:5ddea3b8d2a4
split: include "operation" metadata in obsmarkers
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 12 Mar 2018 15:51:26 -0700 |
| parents | e6bea259c227 |
| children | d5adce52cef4 35ffd7a4b339 |
comparison
equal
deleted
inserted
replaced
| 3566:e6bea259c227 | 3567:5ddea3b8d2a4 |
|---|---|
| 328 | summary: A0 | 328 | summary: A0 |
| 329 | | 329 | |
| 330 | x changeset: 1:471597cad322 | 330 | x changeset: 1:471597cad322 |
| 331 |/ user: test | 331 |/ user: test |
| 332 | date: Thu Jan 01 00:00:00 1970 +0000 | 332 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 333 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a | 333 | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
| 334 | summary: A0 | 334 | summary: A0 |
| 335 | | 335 | |
| 336 o changeset: 0:ea207398892e | 336 o changeset: 0:ea207398892e |
| 337 user: test | 337 user: test |
| 338 date: Thu Jan 01 00:00:00 1970 +0000 | 338 date: Thu Jan 01 00:00:00 1970 +0000 |
| 358 | Precursors: 1:471597cad322 | 358 | Precursors: 1:471597cad322 |
| 359 | semi-colon: 1:471597cad322 | 359 | semi-colon: 1:471597cad322 |
| 360 | @ 471597cad322 | 360 | @ 471597cad322 |
| 361 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a | 361 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
| 362 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a | 362 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
| 363 | Fate: split as 2:337fec4d2edc, 3:f257fde29c7a | 363 | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
| 364 | | 364 | |
| 365 o ea207398892e | 365 o ea207398892e |
| 366 | 366 |
| 367 $ hg fatelog | 367 $ hg fatelog |
| 368 o f257fde29c7a | 368 o f257fde29c7a |
| 369 | | 369 | |
| 370 o 337fec4d2edc | 370 o 337fec4d2edc |
| 371 | | 371 | |
| 372 | @ 471597cad322 | 372 | @ 471597cad322 |
| 373 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a | 373 |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
| 374 | | 374 | |
| 375 o ea207398892e | 375 o ea207398892e |
| 376 | 376 |
| 377 | 377 |
| 378 $ hg up f257fde29c7a | 378 $ hg up f257fde29c7a |
| 397 | Precursors: 1:471597cad322 | 397 | Precursors: 1:471597cad322 |
| 398 | semi-colon: 1:471597cad322 | 398 | semi-colon: 1:471597cad322 |
| 399 | x 471597cad322 | 399 | x 471597cad322 |
| 400 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a | 400 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
| 401 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a | 401 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
| 402 | Fate: split as 2:337fec4d2edc, 3:f257fde29c7a | 402 | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
| 403 | | 403 | |
| 404 o ea207398892e | 404 o ea207398892e |
| 405 | 405 |
| 406 $ hg fatelog --hidden | 406 $ hg fatelog --hidden |
| 407 @ f257fde29c7a | 407 @ f257fde29c7a |
| 408 | | 408 | |
| 409 o 337fec4d2edc | 409 o 337fec4d2edc |
| 410 | | 410 | |
| 411 | x 471597cad322 | 411 | x 471597cad322 |
| 412 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a | 412 |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
| 413 | | 413 | |
| 414 o ea207398892e | 414 o ea207398892e |
| 415 | 415 |
| 416 | 416 |
| 417 $ hg fatelogjson --hidden | 417 $ hg fatelogjson --hidden |
| 418 @ f257fde29c7a [] | 418 @ f257fde29c7a [] |
| 419 | | 419 | |
| 420 o 337fec4d2edc [] | 420 o 337fec4d2edc [] |
| 421 | | 421 | |
| 422 | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] | 422 | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["operation", "split"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] |
| 423 |/ | 423 |/ |
| 424 o ea207398892e [] | 424 o ea207398892e [] |
| 425 | 425 |
| 426 | 426 |
| 427 Test templates with folded commit | 427 Test templates with folded commit |