Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-content-divergent-corner-cases.t
changeset 5349 e8660b28bfee
parent 5345 a73cdef2e33f
child 5364 be5aa681c122 
--- a/tests/test-evolve-content-divergent-corner-cases.t	Thu May 07 01:29:24 2020 +0200
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Thu May 07 01:29:48 2020 +0200
@@ -92,16 +92,16 @@
   8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --all
   @    98ab969ac8fb (4) divergent
-  |\
+  |\     amended(content) from 593c57f2117e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from 8374d2ddc3a4 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
   x |  593c57f2117e (2) divergent
-  | |    amended(content) as 98ab969ac8fb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(description, content) from 5f6d8a4bf34a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  8374d2ddc3a4 (3) divergent
-  |/     amended(content) as 98ab969ac8fb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rewritten(description, content) from 5f6d8a4bf34a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  5f6d8a4bf34a (1) added b
-       rewritten(description, content) as 593c57f2117e using prune by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(description, content) as 8374d2ddc3a4 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
 Test divergence resolution when it yields to an empty commit (issue4950)
@@ -177,16 +177,16 @@
   b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49 6b3776664a258aa4c7e13f90df20ae9170995217 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --all
   @    6b3776664a25 (8) add cdivergent1
-  |\
+  |\     reworded(description) from b2ae71172042 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten from e3ff64ce8d4c using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
   x |  b2ae71172042 (7) add _c
-  | |    reworded(description) as 6b3776664a25 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from 48819a835615 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  e3ff64ce8d4c (6) add cdivergent1
-  |/     rewritten as 6b3776664a25 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rewritten(description, content) from 48819a835615 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  48819a835615 (5) add _c
-       amended(content) as b2ae71172042 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(description, content) as e3ff64ce8d4c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
   $ cd ..
@@ -268,16 +268,16 @@
   6b096fb450709a194b21fb9b192fe9b1572c4af0 b87e0354d5cb081210298429d8b51de9871155a2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --all
   @    b87e0354d5cb (4) bdivergent
-  |\
+  |\     amended(content) from 05a6b6a9e633 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from 6b096fb45070 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
   x |  05a6b6a9e633 (2) bdivergent
-  | |    amended(content) as b87e0354d5cb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(description, content) from 37445b16603b using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  6b096fb45070 (3) bdivergent
-  |/     amended(content) as b87e0354d5cb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rewritten(description, content) from 37445b16603b using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  37445b16603b (1) add _b
-       rewritten(description, content) as 05a6b6a9e633 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(description, content) as 6b096fb45070 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
   $ cd ..
@@ -373,22 +373,22 @@
   a2465d1d56d1aee8ed90d2292978456d2be6f7b9 51ee71efed6170064a7155a9a35e56af0292a203 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --all
   @    51ee71efed61 (9) updated e
-  |\
+  |\     amended(content) from 0ceb21ca2557 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten from a2465d1d56d1 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
   x |  0ceb21ca2557 (7) updated e
-  | |    amended(content) as 51ee71efed61 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rebased(parent) from ff6f7cd76a7c using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  a2465d1d56d1 (8) updated e
-  | |    rewritten as 51ee71efed61 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rebased(parent) from de4ea3103326 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  de4ea3103326 (6) updated e
-  | |    rebased(parent) as a2465d1d56d1 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(description, parent, content) from 8d71eadcc9df using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  ff6f7cd76a7c (5) updated e
-  |/     rebased(parent) as 0ceb21ca2557 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rewritten(description, content) from 8d71eadcc9df using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  8d71eadcc9df (4) added e
-       rewritten(description, parent, content) as de4ea3103326 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(description, content) as ff6f7cd76a7c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
   $ cd ..
@@ -463,14 +463,14 @@
   92ecd58f9b05d6c0a1c3833a79359eea4b0268ff b1badc7ab394c2b9ed21e2961de43c71c2e2288f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --all
   @    b1badc7ab394 (4) delete a
-  |\
+  |\     amended(content) from 0825dcee2670 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from 92ecd58f9b05 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
   x |  0825dcee2670 (2) delete a
-  | |    amended(content) as b1badc7ab394 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from dff6e52f5e41 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  92ecd58f9b05 (3) delete a
-  |/     amended(content) as b1badc7ab394 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     amended(content) from dff6e52f5e41 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  dff6e52f5e41 (1) delete a
-       amended(content) as 0825dcee2670 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-       amended(content) as 92ecd58f9b05 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
evolve