##// END OF EJS Templates
evolution: rename trouble(s) to instability...
Boris Feld -
r33631:6f4bc968 default
parent child Browse files
Show More
@@ -1579,7 +1579,7 b' class changeset_printer(object):'
1579
1579
1580 if ctx.troubled():
1580 if ctx.troubled():
1581 # i18n: column positioning for "hg log"
1581 # i18n: column positioning for "hg log"
1582 self.ui.write(_("trouble: %s\n") % ', '.join(ctx.troubles()),
1582 self.ui.write(_("instability: %s\n") % ', '.join(ctx.troubles()),
1583 label='log.trouble')
1583 label='log.trouble')
1584
1584
1585 self._exthook(ctx)
1585 self._exthook(ctx)
@@ -610,7 +610,7 b' Test that rewriting leaving instability '
610 parent: 11:3334b7925910
610 parent: 11:3334b7925910
611 user: test
611 user: test
612 date: Thu Jan 01 00:00:00 1970 +0000
612 date: Thu Jan 01 00:00:00 1970 +0000
613 trouble: unstable
613 instability: unstable
614 summary: babar
614 summary: babar
615
615
616
616
@@ -442,14 +442,14 b' Test setup'
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 | trouble: divergent
445 | instability: 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 | trouble: divergent
452 | instability: divergent
453 | summary: A1
453 | summary: A1
454 |
454 |
455 | x changeset: 1:471f378eab4c
455 | x changeset: 1:471f378eab4c
@@ -469,7 +469,7 b' Test setup'
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 | trouble: divergent
472 | instability: divergent
473 | summary: A3
473 | summary: A3
474 |
474 |
475 | x changeset: 3:65b757b745b9
475 | x changeset: 3:65b757b745b9
@@ -482,7 +482,7 b' Test setup'
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 | trouble: divergent
485 | instability: divergent
486 | summary: A1
486 | summary: A1
487 |
487 |
488 | x changeset: 1:471f378eab4c
488 | x changeset: 1:471f378eab4c
@@ -1086,20 +1086,20 b' Diverge one of the splitted commit'
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 | trouble: divergent
1089 | instability: 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 | trouble: divergent
1096 | instability: 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 | | trouble: unstable, divergent
1102 | | instability: unstable, 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
@@ -1111,7 +1111,7 b' Diverge one of the splitted commit'
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 | trouble: divergent
1114 | instability: 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
General Comments 0
You need to be logged in to leave comments. Login now