Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: remove unused code in _evolveany stable
authorLaurent Charignon <lcharignon@fb.com>
Thu, 30 Apr 2015 14:30:15 -0700
branchstable
changeset 1306 02a5624c5605
parent 1305 14587fbcba93
child 1307 677c5da57b9c
evolve: remove unused code in _evolveany remove some code that was doing nothing useful in _evolveany.
hgext/evolve.py file | annotate | diff | comparison | revisions 
--- 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:
evolve