diff tests/test-evolve-public-content-divergent-discard.t @ 5857:b0b1ab64f6d8

public-content-divergence: early set the public one to local side

This change helps us to:

  1. remove some check-ups which we had to perform later at the time of
     merging the two (to make sure that public one is at local side).

  2. make the status msgs consistent:
```
       Merge:[public_rev] desc_1
       with: [other_rev]  desc_2
```

--- a/tests/test-evolve-public-content-divergent-discard.t	Fri Mar 19 16:23:24 2021 +0800
+++ b/tests/test-evolve-public-content-divergent-discard.t	Mon Mar 08 17:45:57 2021 +0530
@@ -89,8 +89,8 @@
       public
   
   $ hg evolve --content-divergent --any
-  merge:[3] added ch
-  with: [4] added c
+  merge:[4] added c
+  with: [3] added ch
   base: [2] added c
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   other divergent changeset 90522bccf499 has same content as local f7c1071f1e7c and differs by "description" only, discarding 90522bccf499
@@ -180,10 +180,10 @@
       public
   
   $ hg evolve --content-divergent --any
-  merge:[4] added dh
-  with: [5] added d
+  merge:[5] added d
+  with: [4] added dh
   base: [3] added d
-  rebasing "divergent" content-divergent changeset 5acd58ef5066 on 155349b645be
+  rebasing "other" content-divergent changeset 5acd58ef5066 on 155349b645be
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   other divergent changeset ae3429430ef1 has same content as local e800202333a4 and differs by "description" only, discarding ae3429430ef1
   content divergence resolution between e800202333a4 (public) and ae3429430ef1 has same content as e800202333a4, discarding ae3429430ef1
@@ -265,8 +265,8 @@
       public
   
   $ hg evolve --content-divergent --any
-  merge:[3] added ch
-  with: [4] added c
+  merge:[4] added c
+  with: [3] added ch
   base: [2] added c
   merging ch
   warning: conflicts while merging ch! (edit, then use 'hg resolve --mark')
@@ -379,10 +379,10 @@
       public
   
   $ hg evolve --content-divergent --any
-  merge:[4] added dh
-  with: [5] added d
+  merge:[5] added d
+  with: [4] added dh
   base: [3] added d
-  rebasing "divergent" content-divergent changeset f89a8e2f86ac on 155349b645be
+  rebasing "other" content-divergent changeset f89a8e2f86ac on 155349b645be
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -483,10 +483,10 @@
       public
   
   $ hg evolve --content-divergent --any
-  merge:[4] added dh
-  with: [5] added d
+  merge:[5] added d
+  with: [4] added dh
   base: [3] added d
-  rebasing "divergent" content-divergent changeset db0b7bba0aae on 155349b645be
+  rebasing "other" content-divergent changeset db0b7bba0aae on 155349b645be
   merging dh
   warning: conflicts while merging dh! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -587,10 +587,10 @@
       public
   
   $ hg evolve --content-divergent --any
-  merge:[4] added dh
-  with: [5] added d
+  merge:[5] added d
+  with: [4] added dh
   base: [3] added d
-  rebasing "divergent" content-divergent changeset 67b19bbd770f on 155349b645be
+  rebasing "other" content-divergent changeset 67b19bbd770f on 155349b645be
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts