--- a/hgext/evolve.py	Sun Dec 02 16:21:19 2012 +0100
+++ b/hgext/evolve.py	Mon Dec 03 00:10:58 2012 +0100
@@ -473,7 +473,7 @@
     if ui.config('alias', 'olog', None) is None:
         ui.setconfig('alias', 'olog', "log -r 'precursors(.)' --hidden")
     if ui.config('alias', 'odiff', None) is None:
-        ui.setconfig('alias', 'odiff', "diff --rev 'limit(precursors(.),1)' --rev .")
+        ui.setconfig('alias', 'odiff', "diff --hidden --rev 'limit(precursors(.),1)' --rev .")
 
 # - "troubles" method on changectx
 
@@ -1119,6 +1119,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