# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1502443834 -7200
# Node ID f588de9dd0676a229039e1ffc2067c1cf60599bf
# Parent  2b8b960a04eeb93fd77d6fc402aa40300ea1880d
revset: divergent() is deprecated

Use contentdivergent() instead.

Match 4dd4757db73a mercurial changeset.

diff -r 2b8b960a04ee -r f588de9dd067 hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py	Fri Aug 11 11:23:37 2017 +0200
+++ b/hgext3rd/evolve/__init__.py	Fri Aug 11 11:30:34 2017 +0200
@@ -1017,7 +1017,7 @@
 
     troubled = {
         "orphan": repo.revs("orphan()"),
-        "contentdivergent": repo.revs("divergent()"),
+        "contentdivergent": repo.revs("contentdivergent()"),
         "phasedivergent": repo.revs("bumped()"),
         "all": repo.revs("troubled()"),
     }
diff -r 2b8b960a04ee -r f588de9dd067 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Fri Aug 11 11:23:37 2017 +0200
+++ b/tests/test-obsolete.t	Fri Aug 11 11:30:34 2017 +0200
@@ -681,7 +681,7 @@
   phases: 3 draft
   phase-divergent: 1 changesets
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
-  $ hg log -r 'divergent()'
+  $ hg log -r 'contentdivergent()'
   changeset:   12:6db5e282cb91
   parent:      10:2033b4e49474
   user:        test
diff -r 2b8b960a04ee -r f588de9dd067 tests/test-sharing.t
--- a/tests/test-sharing.t	Fri Aug 11 11:23:37 2017 +0200
+++ b/tests/test-sharing.t	Fri Aug 11 11:30:34 2017 +0200
@@ -520,7 +520,7 @@
   base: [4] fix bug 24 (v1)
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   working directory is now at 5ad6037c046c
-  $ hg log -q -r 'divergent()'
+  $ hg log -q -r 'contentdivergent()'
 
 Figure SG10: Bob's repository after fixing divergence.
   $ hg --hidden shortlog -G -r 3::
diff -r 2b8b960a04ee -r f588de9dd067 tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Fri Aug 11 11:23:37 2017 +0200
+++ b/tests/test-stabilize-result.t	Fri Aug 11 11:30:34 2017 +0200
@@ -341,7 +341,7 @@
   2 new divergent changesets
 # reamend so that the case is not the first precursor.
   $ hg amend -m "More addition (2)"
-  $ hg phase 'divergent()'
+  $ hg phase 'contentdivergent()'
   21: draft
   24: draft
   $ hg evolve -qn --contentdivergent