diff tests/test-evolve-public-content-divergent-corner-cases.t @ 5301:e8660b28bfee

obslog: makes --origin flag the default

Test change have been carefully validated.

--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Thu May 07 01:29:24 2020 +0200
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Thu May 07 01:29:48 2020 +0200
@@ -371,20 +371,20 @@
   9150fe93bec603cd88d05cda9f6ff13420cb53e9 e568fd1029bbe9d506275bbb9a034a0509d80324 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
   $ hg obslog --all --rev tip --patch
   @  93cd84bbdaca (5) added d
+  |    amended(content) from 9150fe93bec6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      diff -r 9150fe93bec6 -r 93cd84bbdaca d
+  |      --- a/d	Thu Jan 01 00:00:00 1970 +0000
+  |      +++ b/d	Thu Jan 01 00:00:00 1970 +0000
+  |      @@ -1,1 +1,1 @@
+  |      -d
+  |      +dd
+  |
   |
   | *  e568fd1029bb (4) added c e
-  |/
+  |/     rewritten(description, parent, content) from 9150fe93bec6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        (No patch available, changesets rebased)
+  |
   x  9150fe93bec6 (3) added d
-       amended(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000)
-         diff -r 9150fe93bec6 -r 93cd84bbdaca d
-         --- a/d	Thu Jan 01 00:00:00 1970 +0000
-         +++ b/d	Thu Jan 01 00:00:00 1970 +0000
-         @@ -1,1 +1,1 @@
-         -d
-         +dd
-  
-       rewritten(description, parent, content) as e568fd1029bb using prune by test (Thu Jan 01 00:00:00 1970 +0000)
-         (No patch available, changesets rebased)
   
 
   $ hg evolve --content-divergent --any --update
@@ -766,14 +766,14 @@
   6a87ed4aa31771f9041ca1260a91f7185f38f15c a52ac76b45f523a039fc4a938d79874f4bdb1a85 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --rev a52ac76b45f5
   @    a52ac76b45f5 (8) c_F
-  |\
+  |\     rewritten from 6a87ed4aa317 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rebased(parent) from 77ccbf8d837e using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
   x |  6a87ed4aa317 (12) c_F
-  | |    rewritten as a52ac76b45f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rebased(parent) from 8ae8db670b4a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  8ae8db670b4a (10) c_F
-  |/     rebased(parent) as 6a87ed4aa317 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rebased(parent) from 77ccbf8d837e using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  77ccbf8d837e (6) c_F
-       rebased(parent) as 8ae8db670b4a using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
-       rebased(parent) as a52ac76b45f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)