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.
test-compat: merge mercurial-5.3 into mercurial-5.2 draft mercurial-5.2
authorAnton Shestakov <av6@dwimlabs.net>
Fri, 08 May 2020 20:24:22 +0800
branchmercurial-5.2
changeset 5362 72340abfcece
parent 5278 6434f3c4f7aa (diff)
parent 5361 51b8024878e9 (current diff)
child 5363 c7c37251d0e2
test-compat: merge mercurial-5.3 into mercurial-5.2
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 May 08 19:49:07 2020 +0800
+++ b/tests/test-evolve-obshistory-amend.t	Fri May 08 20:24:22 2020 +0800
@@ -90,7 +90,7 @@
 
   $ hg obslog --no-graph --patch 4ae3a4151de9
   4ae3a4151de9 (2) A1
-    rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+    rewritten(description, content) from 471f378eab4c 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
@@ -99,7 +99,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
@@ -228,12 +228,12 @@
   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)
   
   $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
   4ae3a4151de9 (1) A1
-    rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+    rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
       (No patch available, predecessor is unknown locally)
   
   471f378eab4c
@@ -449,22 +449,22 @@
   
   $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
   92210308515b (2) A3
-    reworded(description) from 4f1685185907 using amend by test (Thu Jan 01 00:00:01 1970 +0000)
+    reworded(description) from 4f1685185907 using amend by test (Thu Jan 01 00:00:01 1970 +0000)        
       (No patch available, predecessor is unknown locally)
   
   4f1685185907
-    reworded(description) from 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+    reworded(description) from 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
       (No patch available, context is not local)
   
   4ae3a4151de9 (1) A1
-    rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+    rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
       (No patch available, predecessor is unknown locally)
   
   471f378eab4c
   
   $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
   92210308515b (2) A3
-    reworded(description) from 4ae3a4151de9 using amend by test (between Thu Jan 01 00:00:00 1970 +0000 and Thu Jan 01 00:00:01 1970 +0000)
+    reworded(description) from 4ae3a4151de9 using amend by test (between Thu Jan 01 00:00:00 1970 +0000 and Thu Jan 01 00:00:01 1970 +0000)    
       diff -r 4ae3a4151de9 -r 92210308515b changeset-description
       --- a/changeset-description
       +++ b/changeset-description
@@ -474,7 +474,7 @@
    
       -Better commit message
       +Better better better commit message
-  
+      
   
   4ae3a4151de9 (1) A1
   
--- a/tests/test-evolve-obshistory-split.t	Fri May 08 19:49:07 2020 +0800
+++ b/tests/test-evolve-obshistory-split.t	Fri May 08 20:24:22 2020 +0800
@@ -300,7 +300,7 @@
   
   471597cad322
     split(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)
   
   337fec4d2edc (1) A0
@@ -343,14 +343,14 @@
   $ hg obslog -R $TESTTMP/server --no-graph --all --patch tip
   f257fde29c7a (2) A0
     split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
-      note: testing split
+      note: testing split        
       (No patch available, predecessor is unknown locally)
   
   471597cad322
   
   337fec4d2edc (1) A0
     split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
-      note: testing split
+      note: testing split        
       (No patch available, predecessor is unknown locally)
   
   $ hg obslog -R $TESTTMP/server --no-graph -f --all --patch tip
--- a/tests/test-evolve-orphan-merge.t	Fri May 08 19:49:07 2020 +0800
+++ b/tests/test-evolve-orphan-merge.t	Fri May 08 20:24:22 2020 +0800
@@ -521,16 +521,21 @@
   $ hg evolve -r .
   move:[28] merged l and x
   atop:[0] added hgignore
-  evolution of 28:fb8fe870ae7d created no changes to commit
-  working directory is now at 8fa14d15e168
+  working directory is now at b61ba77b924a
 
   $ hg glog
-  @  0:8fa14d15e168 added hgignore
+  @  29:b61ba77b924a merged l and x
+  |   () draft
+  o  0:8fa14d15e168 added hgignore
       () draft
 
 7) When one parent is pruned without successor and has no parent
 ----------------------------------------------------------------
 
+  $ hg prune -r .
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  working directory is now at 8fa14d15e168
+  1 changesets pruned
   $ hg up null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
@@ -544,9 +549,9 @@
   (branch merge, don't forget to commit)
   $ hg ci -m "merge commit"
   $ hg glog
-  @    30:32beb84b9dbc merge commit
+  @    31:32beb84b9dbc merge commit
   |\    () draft
-  | o  29:f3ba8b99bb6f added foo
+  | o  30:f3ba8b99bb6f added foo
   |     () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -556,9 +561,9 @@
   1 new orphan changesets
 
   $ hg glog
-  @    30:32beb84b9dbc merge commit
+  @    31:32beb84b9dbc merge commit
   |\    () draft
-  | x  29:f3ba8b99bb6f added foo
+  | x  30:f3ba8b99bb6f added foo
   |     () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -576,12 +581,12 @@
 just remove that chain.
 
   $ hg evolve -r .
-  move:[30] merge commit
+  move:[31] merge commit
   atop:[-1] 
   working directory is now at d2a03dd8c951
 
   $ hg glog
-  @  31:d2a03dd8c951 merge commit
+  @  32:d2a03dd8c951 merge commit
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft
evolve