diff tests/test-evolve-content-divergent-relocation.t @ 5301:e8660b28bfee

obslog: makes --origin flag the default

Test change have been carefully validated.

--- a/tests/test-evolve-content-divergent-relocation.t	Thu May 07 01:29:24 2020 +0200
+++ b/tests/test-evolve-content-divergent-relocation.t	Thu May 07 01:29:48 2020 +0200
@@ -109,19 +109,19 @@
   11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --all
   @    e7fdc662d630 (8) added b
-  |\
+  |\     amended(content) from 11f849d7159f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten from 7ed0642d644b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
   x |  11f849d7159f (7) added b
-  | |    amended(content) as e7fdc662d630 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rebased(parent) from da4b96f4a8d6 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  7ed0642d644b (5) added b
-  | |    rewritten as e7fdc662d630 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from b1661037fa25 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  da4b96f4a8d6 (6) added b
-  |/     rebased(parent) as 11f849d7159f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rebased(parent) from b1661037fa25 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  b1661037fa25 (2) added b
-       amended(content) as 7ed0642d644b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-       rebased(parent) as da4b96f4a8d6 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
 Resolving orphans to get back to a normal graph
@@ -238,19 +238,19 @@
   911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --all
   @    4e844ab5e814 (15) added foo to x
-  |\
+  |\     rewritten(description, branch, content) from 45e15d6e88f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten from 911c21adca13 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
   x |  45e15d6e88f5 (13) added x
-  | |    rewritten(description, branch, content) as 4e844ab5e814 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rebased(parent) from 801b5920c7ea using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  911c21adca13 (14) added foo to x
-  | |    rewritten as 4e844ab5e814 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rebased(parent) from 5cf74a13db18 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  5cf74a13db18 (12) added foo to x
-  |/     rebased(parent) as 911c21adca13 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rewritten(description, branch, content) from 801b5920c7ea using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  801b5920c7ea (11) added x
-       rebased(parent) as 45e15d6e88f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(description, branch, content) as 5cf74a13db18 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
 Testing when both the content-divergence are on different parents and resolution
@@ -356,22 +356,22 @@
   0fc12918c8daa12ca83ce1e2a38e252b063b6276 ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog -r . --all
   @    ba11a9f47a2e (21) added y
-  |\
+  |\     amended(content) from 0faa43228ee7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(branch, content) from 0fc12918c8da using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
   x |  0faa43228ee7 (19) added y
-  | |    amended(content) as ba11a9f47a2e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from 1bb931596137 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  0fc12918c8da (20) added y
-  | |    rewritten(branch, content) as ba11a9f47a2e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rebased(parent) from 9c32d35206fb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  1bb931596137 (18) added y
-  | |    amended(content) as 0faa43228ee7 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(branch, parent) from ecf1d3992eb4 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  9c32d35206fb (17) added y
-  |/     rebased(parent) as 0fc12918c8da using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     amended(content) from ecf1d3992eb4 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  ecf1d3992eb4 (16) added y
-       rewritten(branch, parent) as 1bb931596137 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
-       amended(content) as 9c32d35206fb using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
 checking that relocated commit is there
@@ -581,22 +581,22 @@
   a7326a0785271a7bef2e812a9a742fb4256b4a3c 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --all
   @    45e55c9ab3d0 (27) added z
-  |\
+  |\     rewritten(branch, content) from a7326a078527 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from ad2ec16eca1e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
   x |  a7326a078527 (26) added z
-  | |    rewritten(branch, content) as 45e55c9ab3d0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(parent, content) from 9bc2ace42175 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  ad2ec16eca1e (25) added z
-  | |    amended(content) as 45e55c9ab3d0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from ee19d6cc6704 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  9bc2ace42175 (23) added z
-  | |    rewritten(parent, content) as a7326a078527 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from 2048a66e8834 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  ee19d6cc6704 (24) added z
-  |/     amended(content) as ad2ec16eca1e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rewritten(branch, parent) from 2048a66e8834 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  2048a66e8834 (22) added z
-       amended(content) as 9bc2ace42175 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(branch, parent) as ee19d6cc6704 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
   $ cd ..
@@ -692,18 +692,18 @@
   88473f9137d12e90055d30bbb9b78dd786520870 916b4ec3b91fd03826bd4b179051ae3cee633b56 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog -r 'desc("divergent")' --all
   o    cc3d0c6117c7 (7) divergent
-  |\
+  |\     amended(content) from befae6138569 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten from bf4fe3a3afeb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
   x |  befae6138569 (3) divergent
-  | |    amended(content) as cc3d0c6117c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rebased(parent) from 898ddd4443b3 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  bf4fe3a3afeb (6) divergent
-  | |    rewritten as cc3d0c6117c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(parent, content) from 4cc21313ecee using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  4cc21313ecee (4) divergent
-  |/     rewritten(parent, content) as bf4fe3a3afeb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     amended(content) from 898ddd4443b3 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  898ddd4443b3 (2) divergent
-       amended(content) as 4cc21313ecee using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-       rebased(parent) as befae6138569 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ cd ..