missing import on merge.py

Lalo Martins lalo at exoweb.net
Thu Aug 25 08:58:59 BST 2005


an import seems to have been lost when merging merge (heh).  Now if I
try to run "pull", I get an error about an undefined global.

*** modified file 'bzrlib/merge.py'
--- bzrlib/merge.py
+++ bzrlib/merge.py
@@ -22,6 +22,7 @@
 import bzrlib.osutils
 from bzrlib.errors import BzrCommandError, UnrelatedBranches
 from bzrlib.delta import compare_trees
+from bzrlib.revision import is_ancestor
 from trace import mutter, warning
 import os.path
 import tempfile


------------

best,
                                               Lalo Martins
--
      So many of our dreams at first seem impossible,
       then they seem improbable, and then, when we
       summon the will, they soon become inevitable.
--
http://www.exoweb.net/                  mailto:lalo at exoweb.net
GNU: never give up freedom                 http://www.gnu.org/





More information about the bazaar mailing list