# HG changeset patch # User Laurent Charignon # Date 1430429415 25200 # Node ID 02a5624c5605bb85f12ecde84d63070bdd49e552 # Parent 14587fbcba939a93eda315daee705bc715d6b66c evolve: remove unused code in _evolveany remove some code that was doing nothing useful in _evolveany. diff -r 14587fbcba93 -r 02a5624c5605 hgext/evolve.py --- 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: