Mercurial > hg-stable

comparison tests/test-obsmarker-template.t @ 33714:2194a8723138

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolution: rename divergent to content-divergent Rename divergent to content-divergent in all external user-facing output. Only update user-facing output for the moment, variables names, templates keyword and potentially configuration would be done in later series. The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. Differential Revision: https://phab.mercurial-scm.org/D215
author Boris Feld <boris.feld@octobus.net>
date Tue, 01 Aug 2017 17:58:20 +0200
parents 03039ff3082b
children 6c1a9fd8361b
comparison
equal deleted inserted replaced
33713:6294654453ee 33714:2194a8723138
440 @ changeset: 3:65b757b745b9 440 @ changeset: 3:65b757b745b9
441 | tag: tip 441 | tag: tip
442 | parent: 0:ea207398892e 442 | parent: 0:ea207398892e
443 | user: test 443 | user: test
444 | date: Thu Jan 01 00:00:00 1970 +0000 444 | date: Thu Jan 01 00:00:00 1970 +0000
445 | instability: divergent 445 | instability: content-divergent
446 | summary: A2 446 | summary: A2
447 | 447 |
448 | o changeset: 2:fdf9bde5129a 448 | o changeset: 2:fdf9bde5129a
449 |/ parent: 0:ea207398892e 449 |/ parent: 0:ea207398892e
450 | user: test 450 | user: test
451 | date: Thu Jan 01 00:00:00 1970 +0000 451 | date: Thu Jan 01 00:00:00 1970 +0000
452 | instability: divergent 452 | instability: content-divergent
453 | summary: A1 453 | summary: A1
454 | 454 |
455 | x changeset: 1:471f378eab4c 455 | x changeset: 1:471f378eab4c
456 |/ user: test 456 |/ user: test
457 | date: Thu Jan 01 00:00:00 1970 +0000 457 | date: Thu Jan 01 00:00:00 1970 +0000
467 @ changeset: 4:019fadeab383 467 @ changeset: 4:019fadeab383
468 | tag: tip 468 | tag: tip
469 | parent: 0:ea207398892e 469 | parent: 0:ea207398892e
470 | user: test 470 | user: test
471 | date: Thu Jan 01 00:00:00 1970 +0000 471 | date: Thu Jan 01 00:00:00 1970 +0000
472 | instability: divergent 472 | instability: content-divergent
473 | summary: A3 473 | summary: A3
474 | 474 |
475 | x changeset: 3:65b757b745b9 475 | x changeset: 3:65b757b745b9
476 |/ parent: 0:ea207398892e 476 |/ parent: 0:ea207398892e
477 | user: test 477 | user: test
480 | 480 |
481 | o changeset: 2:fdf9bde5129a 481 | o changeset: 2:fdf9bde5129a
482 |/ parent: 0:ea207398892e 482 |/ parent: 0:ea207398892e
483 | user: test 483 | user: test
484 | date: Thu Jan 01 00:00:00 1970 +0000 484 | date: Thu Jan 01 00:00:00 1970 +0000
485 | instability: divergent 485 | instability: content-divergent
486 | summary: A1 486 | summary: A1
487 | 487 |
488 | x changeset: 1:471f378eab4c 488 | x changeset: 1:471f378eab4c
489 |/ user: test 489 |/ user: test
490 | date: Thu Jan 01 00:00:00 1970 +0000 490 | date: Thu Jan 01 00:00:00 1970 +0000
1084 @ changeset: 9:0b997eb7ceee 1084 @ changeset: 9:0b997eb7ceee
1085 | tag: tip 1085 | tag: tip
1086 | parent: 5:dd800401bd8c 1086 | parent: 5:dd800401bd8c
1087 | user: test 1087 | user: test
1088 | date: Thu Jan 01 00:00:00 1970 +0000 1088 | date: Thu Jan 01 00:00:00 1970 +0000
1089 | instability: divergent 1089 | instability: content-divergent
1090 | summary: Add B only 1090 | summary: Add B only
1091 | 1091 |
1092 | o changeset: 8:b18bc8331526 1092 | o changeset: 8:b18bc8331526
1093 |/ parent: 5:dd800401bd8c 1093 |/ parent: 5:dd800401bd8c
1094 | user: test 1094 | user: test
1095 | date: Thu Jan 01 00:00:00 1970 +0000 1095 | date: Thu Jan 01 00:00:00 1970 +0000
1096 | instability: divergent 1096 | instability: content-divergent
1097 | summary: Add only B 1097 | summary: Add only B
1098 | 1098 |
1099 | o changeset: 7:ba2ed02b0c9a 1099 | o changeset: 7:ba2ed02b0c9a
1100 | | user: test 1100 | | user: test
1101 | | date: Thu Jan 01 00:00:00 1970 +0000 1101 | | date: Thu Jan 01 00:00:00 1970 +0000
1102 | | instability: orphan, divergent 1102 | | instability: orphan, content-divergent
1103 | | summary: Add A,B,C 1103 | | summary: Add A,B,C
1104 | | 1104 | |
1105 | x changeset: 6:4a004186e638 1105 | x changeset: 6:4a004186e638
1106 |/ user: test 1106 |/ user: test
1107 | date: Thu Jan 01 00:00:00 1970 +0000 1107 | date: Thu Jan 01 00:00:00 1970 +0000
1109 | 1109 |
1110 o changeset: 5:dd800401bd8c 1110 o changeset: 5:dd800401bd8c
1111 | parent: 3:f897c6137566 1111 | parent: 3:f897c6137566
1112 | user: test 1112 | user: test
1113 | date: Thu Jan 01 00:00:00 1970 +0000 1113 | date: Thu Jan 01 00:00:00 1970 +0000
1114 | instability: divergent 1114 | instability: content-divergent
1115 | summary: Add A,B,C 1115 | summary: Add A,B,C
1116 | 1116 |
1117 o changeset: 3:f897c6137566 1117 o changeset: 3:f897c6137566
1118 | parent: 0:ea207398892e 1118 | parent: 0:ea207398892e
1119 | user: test 1119 | user: test