diff -r 722b52c75f02 -r 218b540f5c93 hgext/evolve.py
--- a/hgext/evolve.py	Mon Dec 17 14:33:01 2012 +0100
+++ b/hgext/evolve.py	Tue Dec 04 00:18:32 2012 +0100
@@ -967,6 +967,8 @@
     elif 'bumped' in troubles:
         return _solvebumped(ui, repo, tr, opts['dry_run'])
     elif 'divergent' in troubles:
+        repo = repo.unfiltered()
+        tr = repo[tr.rev()]
         return _solvedivergent(ui, repo, tr, opts['dry_run'])
     else:
         assert False  # WHAT? unknown troubles