0.229  encoding stdout as sys.stdout encoding 'UTF-8'
0.230  bzr arguments: [u'merge-upstream', u'--version=2.7', u'../tvbrowser-2.7-src.zip']
0.230  looking for plugins in /home/user/.bazaar/plugins
0.321  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.321  Plugin name __init__ already loaded
0.321  Plugin name builddeb already loaded
0.321  Plugin name __init__ already loaded
0.377  encoding stdout as sys.stdout encoding 'UTF-8'
0.481  opening working tree '/home/user/ubuntu/tvbrowser/tvbrowser'
0.491  Using 'debian/changelog' to get package information
[29787] 2008-07-05 01:57:31.845 WARNING: Conflict: can't delete debian because it is not empty.  Not deleting.
[29787] 2008-07-05 01:57:31.969 INFO: 1 conflicts encountered.
3.660  preparing to commit
3.698  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 846, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 797, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 499, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/user/.bazaar/plugins/builddeb/__init__.py", line 413, in run
    merge_upstream(tree, filename, version)
  File "/home/user/.bazaar/plugins/builddeb/merge_upstream.py", line 150, in merge_upstream
    tree.commit('import upstream from %s' % os.path.basename(source))
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line 240, in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 197, in commit
    revprops=revprops, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 289, in commit
    raise ConflictsInTree
ConflictsInTree: Working tree has conflicts.

3.699  return code 3

0.250  encoding stdout as sys.stdout encoding 'UTF-8'
0.251  bzr arguments: [u'st']
0.251  looking for plugins in /home/user/.bazaar/plugins
0.340  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.341  Plugin name __init__ already loaded
0.341  Plugin name builddeb already loaded
0.341  Plugin name __init__ already loaded
0.404  encoding stdout as sys.stdout encoding 'UTF-8'
0.510  opening working tree '/home/user/ubuntu/tvbrowser/tvbrowser'
0.520  check paths: None
1.047  return code 0

0.223  encoding stdout as sys.stdout encoding 'UTF-8'
0.224  bzr arguments: [u'revert']
0.224  looking for plugins in /home/user/.bazaar/plugins
0.306  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.306  Plugin name __init__ already loaded
0.306  Plugin name builddeb already loaded
0.307  Plugin name __init__ already loaded
0.372  encoding stdout as sys.stdout encoding 'UTF-8'
0.484  opening working tree '/home/user/ubuntu/tvbrowser/tvbrowser'
[29833] 2008-07-05 01:58:02.181 INFO: +N  .settings/
[...]
[29833] 2008-07-05 01:58:02.532 INFO: +N  txt/showview/showview.htm
4.599  return code 0