Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obslog: phase divergence fix for b135591bec1a
authorMartin von Zweigbergk <martinvonz@google.com>
Sat, 16 Nov 2019 01:44:31 +0100
changeset 4954 a76ed637acba
parent 4952 b135591bec1a
child 4955 e5d92ac69a9c
obslog: phase divergence fix for b135591bec1a I forgot to pull the latest version before publishing the topic :-(
tests/test-evolve-obshistory-amend.t file | annotate | diff | comparison | revisions
tests/test-evolve-obshistory-split.t file | annotate | diff | comparison | revisions 
--- a/tests/test-evolve-obshistory-amend.t	Fri Nov 15 09:53:42 2019 -0800
+++ b/tests/test-evolve-obshistory-amend.t	Sat Nov 16 01:44:31 2019 +0100
@@ -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)
   
--- a/tests/test-evolve-obshistory-split.t	Fri Nov 15 09:53:42 2019 -0800
+++ b/tests/test-evolve-obshistory-split.t	Sat Nov 16 01:44:31 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)
evolve