diff -r 62eff490c844 -r 80a300088654 hgkw/keyword.py --- a/hgkw/keyword.py Mon Oct 29 10:55:41 2007 +0100 +++ b/hgkw/keyword.py Tue Nov 06 13:20:39 2007 +0100 @@ -89,8 +89,8 @@ try: # cmdutil.parse moves to dispatch._parse in 18a9fbb5cd78 - from mercurial import dispatch - _parse = dispatch._parse + # also avoid name conflict with other dispatch package(s) + from mercurial.dispatch import _parse except ImportError: try: # commands.parse moves to cmdutil.parse in 0c61124ad877