Updating http://bazaar-ng.org/bzr/bzr.dev/ to /home/uws/Computi ng/Source/Bazaar-NG/bzr.dev
bzr: WARNING: Other branch modified locally deleted file bzrlib/tests/test_merge .py
Traceback (most recent call last):
File "/home/uws/.bazaar/plugins/update-mirrors/__init__.py", line 104, in run
r = pull_branch(br, verbose=verbose, overwrite=overwrite)
File "/home/uws/.bazaar/plugins/update-mirrors/__init__.py", line 36, in pull_ branch
br.working_tree().pull(br_from, overwrite)
File "/home/uws/Computing/Source/Bazaar-NG/bzr.dev/bzrlib/branch.py", line 89, in decorated
return unbound(self, *args, **kwargs)
File "/home/uws/Computing/Source/Bazaar-NG/bzr.dev/bzrlib/workingtree.py", lin e 673, in pull
self.branch.revision_tree(other_revision))
File "/home/uws/Computing/Source/Bazaar-NG/bzr.dev/bzrlib/merge.py", line 372, in merge_inner
return merger.do_merge()
File "/home/uws/Computing/Source/Bazaar-NG/bzr.dev/bzrlib/merge.py", line 552, in do_merge
interesting_ids=self.interesting_ids)
File "/home/uws/Computing/Source/Bazaar-NG/bzr.dev/bzrlib/merge_core.py", line 161, in merge_flex
this.basedir, conflict_handler, False)
File "/home/uws/Computing/Source/Bazaar-NG/bzr.dev/bzrlib/changeset.py", line 1213, in apply_changeset
raise OldFailedTreeOp()
OldFailedTreeOp: bzr-tree-change contains files from a previous failed merge ope ration.