summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-07-20 16:23:42 +0200
committerJelmer Vernooij <jelmer@samba.org>2011-07-20 16:23:42 +0200
commit924f946fa80a355540d841a4cf56a56787a3ffe5 (patch)
tree8e3078ab057a4575e1ac373362b101c4f3ba7783
parent44b7aa2c61caf1363831db4fa200af183c667927 (diff)
downloadbzr-fastimport-924f946fa80a355540d841a4cf56a56787a3ffe5.tar.gz
error has been renamed to show_error.
-rw-r--r--branch_updater.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/branch_updater.py b/branch_updater.py
index 0f9b7be..caf720f 100644
--- a/branch_updater.py
+++ b/branch_updater.py
@@ -19,7 +19,7 @@
from operator import itemgetter
from bzrlib import bzrdir, errors, osutils, transport
-from bzrlib.trace import error, note
+from bzrlib.trace import show_error, note
from bzrlib.plugins.fastimport.helpers import (
best_format_for_objects_in_a_repository,
@@ -119,7 +119,7 @@ class BranchUpdater(object):
branch_tips.append((br,tip))
continue
except errors.BzrError, ex:
- error("ERROR: failed to create branch %s: %s",
+ show_error("ERROR: failed to create branch %s: %s",
location, ex)
lost_head = self.cache_mgr.lookup_committish(tip)
lost_info = (name, lost_head)