Mercurial > evolve

changeset 490:8096833e9226

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sort import
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 23 Aug 2012 18:21:18 +0200
parents fdf3ae486e01
children 6989d8fe4ed2
files hgext/evolve.py hgext/obsolete.py
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/hgext/obsolete.py	Thu Aug 23 18:19:42 2012 +0200
+++ b/hgext/obsolete.py	Thu Aug 23 18:21:18 2012 +0200
@@ -58,11 +58,11 @@
 from mercurial import error
 from mercurial import extensions
 from mercurial import localrepo
+from mercurial import merge
 from mercurial import phases
 from mercurial import revset
 from mercurial import scmutil
 from mercurial import templatekw
-from mercurial import merge
 from mercurial.node import bin, short, nullid
 
 # This extension contains the following code