# HG changeset patch # User Pierre-Yves David # Date 1573865140 -3600 # Node ID e5d92ac69a9c5cfddab22590de187164e91bea0f # Parent a76ed637acbac7c4f60e8e2db54220ea25d8f49c# Parent 5c41bb482867978b36baa34b66f2fd6e9e05f05a obslog: phase divergence fix for 5c41bb482867 I forgot to pull the latest version before publishing the topic :-( diff -r 5c41bb482867 -r e5d92ac69a9c tests/test-evolve-obshistory-amend.t --- a/tests/test-evolve-obshistory-amend.t Fri Nov 15 10:25:46 2019 -0800 +++ b/tests/test-evolve-obshistory-amend.t Sat Nov 16 01:45:40 2019 +0100 @@ -94,7 +94,7 @@ 4ae3a4151de9 (2) A1 471f378eab4c (1) A0 - rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description --- a/changeset-description +++ b/changeset-description @@ -103,7 +103,7 @@ +A1 + +Better commit message - + diff -r 471f378eab4c -r 4ae3a4151de9 A0 --- a/A0 Thu Jan 01 00:00:00 1970 +0000 +++ b/A0 Thu Jan 01 00:00:00 1970 +0000 @@ -244,7 +244,7 @@ 4ae3a4151de9 (1) A1 471f378eab4c - rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, context is not local) @@ -252,7 +252,7 @@ 4ae3a4151de9 (1) A1 471f378eab4c - rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, context is not local) @@ -455,15 +455,15 @@ 92210308515b (2) A3 4f1685185907 - rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, context is not local) 4ae3a4151de9 (1) A1 - rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, successor is unknown locally) 471f378eab4c - rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, context is not local) @@ -471,14 +471,14 @@ 92210308515b (2) A3 4f1685185907 - rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, context is not local) 4ae3a4151de9 (1) A1 - rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, successor is unknown locally) 471f378eab4c - rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, context is not local) diff -r 5c41bb482867 -r e5d92ac69a9c tests/test-evolve-obshistory-split.t --- a/tests/test-evolve-obshistory-split.t Fri Nov 15 10:25:46 2019 -0800 +++ b/tests/test-evolve-obshistory-split.t Sat Nov 16 01:45:40 2019 +0100 @@ -247,7 +247,7 @@ 471597cad322 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) - note: testing split + note: testing split (No patch available, context is not local) @@ -256,6 +256,6 @@ 471597cad322 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) - note: testing split + note: testing split (No patch available, context is not local)