diff -r 62a4ccf9784a -r 6f53a53245a2 tests/test-obsolete-divergent.t --- a/tests/test-obsolete-divergent.t Mon Oct 09 15:34:12 2017 +0200 +++ b/tests/test-obsolete-divergent.t Mon Oct 09 15:34:26 2017 +0200 @@ -66,7 +66,7 @@ | | o 2:82623d38b9ba A_1 |/ - | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |/ @ 0:d20a80d4def3 base @@ -127,11 +127,11 @@ $ hg log -G --hidden @ 4:01f36c5a8fda A_3 | - | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)] + | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] |/ | o 2:82623d38b9ba A_1 |/ - | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |/ o 0:d20a80d4def3 base @@ -185,7 +185,7 @@ | | o 2:82623d38b9ba A_1 |/ - | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |/ @ 0:d20a80d4def3 base @@ -259,11 +259,11 @@ $ hg log -G --hidden @ 4:01f36c5a8fda A_3 | - | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)] + | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] |/ - | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)] + | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] |/ - | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |/ o 0:d20a80d4def3 base @@ -309,7 +309,7 @@ | | o 2:82623d38b9ba A_1 |/ - | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] |/ @ 0:d20a80d4def3 base @@ -361,15 +361,15 @@ $ hg log -G --hidden @ 6:e442cfc57690 A_5 | - | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 (at 1970-01-01 00:00 +0000)] + | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] |/ | o 4:01f36c5a8fda A_3 |/ - | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a (at 1970-01-01 00:00 +0000)] + | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] |/ - | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)] + | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] |/ - | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] |/ o 0:d20a80d4def3 base @@ -437,19 +437,19 @@ |/ | o 8:7ae126973a96 A_7 |/ - | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)] + | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] | | - | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a (at 1970-01-01 00:00 +0000); split as 8:7ae126973a96, 9:14608b260df8 (at 1970-01-01 00:00 +0000)] + | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] |/ - | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 (at 1970-01-01 00:00 +0000)] + | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] |/ | o 4:01f36c5a8fda A_3 |/ - | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a (at 1970-01-01 00:00 +0000)] + | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] |/ - | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)] + | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] |/ - | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] |/ @ 0:d20a80d4def3 base @@ -535,25 +535,25 @@ $ hg log -G --hidden o 11:a139f71be9da A_A | - | x 10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da (at 1970-01-01 00:00 +0000)] + | x 10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da] |/ - | x 9:14608b260df8 A_8 [rewritten as 11:a139f71be9da (at 1970-01-01 00:00 +0000)] + | x 9:14608b260df8 A_8 [rewritten as 11:a139f71be9da] |/ - | x 8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da (at 1970-01-01 00:00 +0000)] + | x 8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da] |/ - | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)] + | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] | | - | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a (at 1970-01-01 00:00 +0000); split as 8:7ae126973a96, 9:14608b260df8 (at 1970-01-01 00:00 +0000)] + | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] |/ - | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 (at 1970-01-01 00:00 +0000)] + | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] |/ | o 4:01f36c5a8fda A_3 |/ - | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a (at 1970-01-01 00:00 +0000)] + | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] |/ - | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)] + | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] |/ - | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] |/ @ 0:d20a80d4def3 base