# HG changeset patch # User Boris Feld # Date 1502444637 -7200 # Node ID 9688988472daf3887a3a4f031f1e9dc5471ab8fd # Parent f588de9dd0676a229039e1ffc2067c1cf60599bf revset: bumped() is deprecated Use phasedivergent() instead. Match bd71c06eb62f mercurial changeset. diff --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py +++ b/hgext3rd/evolve/__init__.py @@ -1018,7 +1018,7 @@ troubled = { "orphan": repo.revs("orphan()"), "contentdivergent": repo.revs("contentdivergent()"), - "phasedivergent": repo.revs("bumped()"), + "phasedivergent": repo.revs("phasedivergent()"), "all": repo.revs("troubled()"), } diff --git a/tests/test-evolve.t b/tests/test-evolve.t --- a/tests/test-evolve.t +++ b/tests/test-evolve.t @@ -435,7 +435,7 @@ @@ -3,1 +3,1 @@ -Zwei +deux - $ hg log -r 'bumped()' # no more bumped + $ hg log -r 'phasedivergent()' # no more bumped test evolve --all $ sed -i'' -e s/deux/to/ main-file-1 diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -586,7 +586,7 @@ | o 0 - (public) 1f0dee641bb7 add a - $ hg log -r 'bumped()' + $ hg log -r 'phasedivergent()' changeset: 12:6db5e282cb91 tag: tip parent: 10:2033b4e49474