Mercurial > evolve

diff hgext/evolve.py @ 1306:02a5624c5605 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: remove unused code in _evolveany remove some code that was doing nothing useful in _evolveany.
author Laurent Charignon <lcharignon@fb.com>
date Thu, 30 Apr 2015 14:30:15 -0700
parents 14587fbcba93
children 677c5da57b9c
line wrap: on
line diff
--- 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: