diff -r fdf3ae486e01 -r 8096833e9226 hgext/evolve.py --- a/hgext/evolve.py Thu Aug 23 18:19:42 2012 +0200 +++ b/hgext/evolve.py Thu Aug 23 18:21:18 2012 +0200 @@ -11,18 +11,18 @@ import random +from mercurial import bookmarks from mercurial import cmdutil -from mercurial import scmutil -from mercurial import node +from mercurial import commands +from mercurial import context +from mercurial import copies from mercurial import error from mercurial import extensions -from mercurial import commands -from mercurial import bookmarks +from mercurial import merge +from mercurial import node from mercurial import phases -from mercurial import context -from mercurial import copies +from mercurial import scmutil from mercurial import util -from mercurial import merge from mercurial.i18n import _ from mercurial.commands import walkopts, commitopts, commitopts2 from mercurial import hg