--- a/hgext/evolve.py	Thu Apr 30 14:22:30 2015 -0700
+++ b/hgext/evolve.py	Thu Apr 30 14:30:15 2015 -0700
@@ -1260,8 +1260,6 @@
     elif 'bumped' in troubles:
         return _solvebumped(ui, repo, tro, dryrunopt, confirmopt, progresscb)
     elif 'divergent' in troubles:
-        repo = repo.unfiltered()
-        tro = repo[tro.rev()]
         return _solvedivergent(ui, repo, tro, dryrunopt, confirmopt,
                                progresscb)
     else: