bzr selftest error on NFS share in test_remerge
Jamie Wilkinson
jaq at spacepants.org
Wed Apr 12 08:04:56 BST 2006
Well, I don't know that it's being caused by NFS, but that's the only
difference between my workstation and laptop, both running the same revision
of bzr.dev; all tests pass on the laptop.
Attached is a dump of the entire selftest run. Interestingly before this
pull there were many more failures[1], so it's definitely an improvement :-)
[1] No I'm not using a bzr that fails in production; I merge from my copy of
bzr.dev to my local dev branch and dogfood with that; currently that other
branch is a bit stale but all the tests pass :)
-------------- next part --------------
booty% cd src/bzr/bzr.dev
booty% bzr pull
Using saved location: http://bazaar-ng.org/bzr/bzr.dev/
\ [=============== ] Pull phase 0/2Inventory ok.
All changes applied successfully.
17 revision(s) pulled.
booty% ./bzr selftest --no-plugins
running tests...
bzr: /home/jaq/src/bzr/bzr.dev/bzr
bzrlib: /home/jaq/src/bzr/bzr.dev/bzrlib
/home/jaq/src/bzr/bzr.dev/bzrlib/transport/ftp.py:392: UserWarning: There are no FTP transport provider tests yet.
warn("There are no FTP transport provider tests yet.")
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~S~~SSSSSSSS~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~SS~~~~S~~~~SS~~~~S~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~bzr: ERROR: Channel request for unknown channel 1
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Disabled: test_precious_revision_history
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~TODO for merging: create a corrupted knit.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~F~~~~~~~~~~S~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~S~~S~~S~~S~~S~SSSSSS~S~~S~~~~~S~~S~~S~~S~~S~~S~SSS~S~~S~~S~~S~~S~~S~~S~~S~~S~~S~~S~~S~~S~~S~~~~~~~~~~~~~~S~~~~~~~~~~~S~~S~~S~~~~~~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~S~SSSS~~S~~~S~~~S~~~S~~~S~~~~~~~~~~~~~~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~~~~~S~~~S~~~S~~~~~~~~~~~~~~~~~~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~S~SSSS~~S~~~S~~~S~~~S~~~S~~~S~~~S~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~~~S~~SSSSSSSSSS~~S~~~~S~~~~~~~~~S~~~~~~~~~~~~~~S~~~~S~~~~S~~~~~~~~~S~~~~S~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~S~~~~SS~~~~~~~S~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
======================================================================
FAIL: test_remerge (bzrlib.tests.blackbox.test_too_much.TestCommands)
vvvv[log from bzrlib.tests.blackbox.test_too_much.TestCommands.test_remerge]--
run bzr: init
created control directory in /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/
creating repository in /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/.bzr/.
creating branch in /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/.bzr/
got branch format Bazaar-NG branch format 4
got branch format Bazaar-NG branch format 4
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/'
failed to open /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/.bzr/stat-cache: [Errno 2] No such file or directory: u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/.bzr/stat-cache'
write hc
write hash cache: /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/.bzr/stat-cache hits=0 misses=0 stat=0 recent=0 updates=0
wrote working inventory
wrote working inventory
wrote working inventory
got branch format Bazaar-NG branch format 4
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/'
got branch format Bazaar-NG branch format 4
run bzr: add
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/'
got branch format Bazaar-NG branch format 4
smart add of u'.', abs=u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/'
lookup path []
trying to open u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/' with transport <bzrlib.transport.local.LocalTransport url=/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/>
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/'
got branch format Bazaar-NG branch format 4
tree root doesn't need to be added
queue to add sub-file u'hello'
queue to add sub-file u'answer'
skip control directory u'.bzr'
smart add of u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/hello', abs=u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/hello'
lookup path [u'hello']
lookup path [u'hello']
lookup path []
lookup path []
added u'hello' kind 'file' file_id={hello-20060412062337-f4e04f9349175c48}
smart add of u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/answer', abs=u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/answer'
lookup path [u'answer']
lookup path [u'answer']
lookup path []
lookup path []
added u'answer' kind 'file' file_id={answer-20060412062337-5973f9af159dd7ed}
added 2 entries
wrote working inventory
output:
added hello
added answer
run bzr: commit -m base
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/'
got branch format Bazaar-NG branch format 4
preparing to commit
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/')
Selecting files for commit with filter None
check answer {answer-20060412062337-5973f9af159dd7ed}
answer selected for commit
check hello {hello-20060412062337-f4e04f9349175c48}
hello selected for commit
new parents of answer are {}
new revision for {answer-20060412062337-5973f9af159dd7ed}
storing file {answer-20060412062337-5973f9af159dd7ed} in revision {jaq at booty-20060412062337-61c3ed7c3836f281}
INFO added answer
new parents of hello are {}
new revision for {hello-20060412062337-f4e04f9349175c48}
storing file {hello-20060412062337-f4e04f9349175c48} in revision {jaq at booty-20060412062337-61c3ed7c3836f281}
INFO added hello
add store entry u'jaq at booty-20060412062337-61c3ed7c3836f281'
added revision_id {jaq at booty-20060412062337-61c3ed7c3836f281}
add {jaq at booty-20060412062337-61c3ed7c3836f281} to revision-history
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/')
INFO Committed revision 1.
write hash cache: /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/.bzr/stat-cache hits=0 misses=2 stat=2 recent=0 updates=2
errors:
added answer
added hello
Committed revision 1.
run bzr: branch . ../other
trying to open u'.' with transport <bzrlib.transport.local.LocalTransport url=/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/>
got branch format Bazaar-NG branch format 4
created control directory in /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/
creating repository in /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/.bzr/.
copy_all ids: ['answer-20060412062337-5973f9af159dd7ed', 'hello-20060412062337-f4e04f9349175c48']
copy weave {answer-20060412062337-5973f9af159dd7ed} into VersionedFileStore(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/.bzr/weaves/')
copy weave {hello-20060412062337-f4e04f9349175c48} into VersionedFileStore(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/.bzr/weaves/')
copy weave {inventory} into VersionedFileStore(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/.bzr/')
copy_all ids: ['jaq at booty-20060412062337-61c3ed7c3836f281']
_copy_one: 'jaq at booty-20060412062337-61c3ed7c3836f281', None
_copy_one: 'jaq at booty-20060412062337-61c3ed7c3836f281', 'sig'
got branch format Bazaar-NG branch format 4
creating branch in /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/.bzr/
got branch format Bazaar-NG branch format 4
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/')
got branch format Bazaar-NG branch format 4
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/'
failed to open /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/.bzr/stat-cache: [Errno 2] No such file or directory: u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/.bzr/stat-cache'
write hc
write hash cache: /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/.bzr/stat-cache hits=0 misses=0 stat=0 recent=0 updates=0
wrote working inventory
wrote working inventory
lookup path []
lookup path ['answer']
lookup path []
lookup path ['hello']
wrote working inventory
got branch format Bazaar-NG branch format 4
INFO Branched 1 revision(s).
errors:
Branched 1 revision(s).
run bzr: branch . ../this
trying to open u'.' with transport <bzrlib.transport.local.LocalTransport url=/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/>
got branch format Bazaar-NG branch format 4
created control directory in /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/
creating repository in /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/.bzr/.
copy_all ids: ['answer-20060412062337-5973f9af159dd7ed', 'hello-20060412062337-f4e04f9349175c48']
copy weave {answer-20060412062337-5973f9af159dd7ed} into VersionedFileStore(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/.bzr/weaves/')
copy weave {hello-20060412062337-f4e04f9349175c48} into VersionedFileStore(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/.bzr/weaves/')
copy weave {inventory} into VersionedFileStore(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/.bzr/')
copy_all ids: ['jaq at booty-20060412062337-61c3ed7c3836f281']
_copy_one: 'jaq at booty-20060412062337-61c3ed7c3836f281', None
_copy_one: 'jaq at booty-20060412062337-61c3ed7c3836f281', 'sig'
got branch format Bazaar-NG branch format 4
creating branch in /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/.bzr/
got branch format Bazaar-NG branch format 4
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/base/')
got branch format Bazaar-NG branch format 4
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
failed to open /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/.bzr/stat-cache: [Errno 2] No such file or directory: u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/.bzr/stat-cache'
write hc
write hash cache: /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/.bzr/stat-cache hits=0 misses=0 stat=0 recent=0 updates=0
wrote working inventory
wrote working inventory
lookup path []
lookup path ['answer']
lookup path []
lookup path ['hello']
wrote working inventory
got branch format Bazaar-NG branch format 4
INFO Branched 1 revision(s).
errors:
Branched 1 revision(s).
run bzr: commit -m other
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/'
got branch format Bazaar-NG branch format 4
preparing to commit
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/')
commit parent revision {jaq at booty-20060412062337-61c3ed7c3836f281}
Selecting files for commit with filter None
check answer {answer-20060412062337-5973f9af159dd7ed}
answer selected for commit
check hello {hello-20060412062337-f4e04f9349175c48}
hello selected for commit
new parents of answer are {'jaq at booty-20060412062337-61c3ed7c3836f281': InventoryFile('answer-20060412062337-5973f9af159dd7ed', 'answer', parent_id='TREE_ROOT')}
new revision for {answer-20060412062337-5973f9af159dd7ed}
storing file {answer-20060412062337-5973f9af159dd7ed} in revision {jaq at booty-20060412062338-13349ccb65564b4c}
INFO modified/renamed/reparented answer
new parents of hello are {'jaq at booty-20060412062337-61c3ed7c3836f281': InventoryFile('hello-20060412062337-f4e04f9349175c48', 'hello', parent_id='TREE_ROOT')}
new revision for {hello-20060412062337-f4e04f9349175c48}
storing file {hello-20060412062337-f4e04f9349175c48} in revision {jaq at booty-20060412062338-13349ccb65564b4c}
INFO modified/renamed/reparented hello
add store entry u'jaq at booty-20060412062338-13349ccb65564b4c'
added revision_id {jaq at booty-20060412062338-13349ccb65564b4c}
add {jaq at booty-20060412062338-13349ccb65564b4c} to revision-history
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/other/')
INFO Committed revision 2.
errors:
modified/renamed/reparented answer
modified/renamed/reparented hello
Committed revision 2.
run bzr: mv answer question
not a branch in: u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/answer/' Not a branch: /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/answer/
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
lookup path [u'answer']
lookup path [u'question']
lookup path []
rename_one:
file_id {answer-20060412062337-5973f9af159dd7ed}
from_rel u'answer'
to_rel u'question'
to_dir u''
to_dir_id {TREE_ROOT}
wrote working inventory
output:
answer => question
run bzr: commit -m this
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
preparing to commit
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
commit parent revision {jaq at booty-20060412062337-61c3ed7c3836f281}
Selecting files for commit with filter None
check hello {hello-20060412062337-f4e04f9349175c48}
hello selected for commit
check question {answer-20060412062337-5973f9af159dd7ed}
question selected for commit
new parents of hello are {'jaq at booty-20060412062337-61c3ed7c3836f281': InventoryFile('hello-20060412062337-f4e04f9349175c48', 'hello', parent_id='TREE_ROOT')}
new revision for {hello-20060412062337-f4e04f9349175c48}
storing file {hello-20060412062337-f4e04f9349175c48} in revision {jaq at booty-20060412062338-7269f24ca52bfb04}
INFO modified/renamed/reparented hello
new parents of question are {'jaq at booty-20060412062337-61c3ed7c3836f281': InventoryFile('answer-20060412062337-5973f9af159dd7ed', 'answer', parent_id='TREE_ROOT')}
new revision for {answer-20060412062337-5973f9af159dd7ed}
storing file {answer-20060412062337-5973f9af159dd7ed} in revision {jaq at booty-20060412062338-7269f24ca52bfb04}
INFO modified/renamed/reparented question
add store entry u'jaq at booty-20060412062338-7269f24ca52bfb04'
added revision_id {jaq at booty-20060412062338-7269f24ca52bfb04}
add {jaq at booty-20060412062338-7269f24ca52bfb04} to revision-history
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
INFO Committed revision 2.
errors:
modified/renamed/reparented hello
modified/renamed/reparented question
Committed revision 2.
run bzr: merge ../other --show-base
got option '--show-base'
got branch format Bazaar-NG branch format 4
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
start compare_trees
start looking for new files
got branch format Bazaar-NG branch format 4
Using fetch logic to copy between <bzrlib.repository.AllInOneRepository object at 0xb32f348c>(<bzrlib.repository.RepositoryFormat6 object at 0xb32f33cc>) and <bzrlib.repository.AllInOneRepository object at 0xb32f30cc>(<bzrlib.repository.RepositoryFormat6 object at 0xb32f1d2c>)
fetch up to rev {jaq at booty-20060412062338-13349ccb65564b4c}
merged = 1, processed = 2, file_id=54/answer-20060412062337-5973f9af159dd7ed; deltat=0
merged = 1, processed = 2, file_id=41/hello-20060412062337-f4e04f9349175c48; deltat=0
merged = 1, processed = 2, file_id=inventory; deltat=0
add store entry 'jaq at booty-20060412062338-13349ccb65564b4c'
added revision_id {jaq at booty-20060412062338-13349ccb65564b4c}
Using fetch logic to copy between <bzrlib.repository.AllInOneRepository object at 0xb32f348c>(<bzrlib.repository.RepositoryFormat6 object at 0xb32f33cc>) and <bzrlib.repository.AllInOneRepository object at 0xb32f30cc>(<bzrlib.repository.RepositoryFormat6 object at 0xb32f1d2c>)
fetch up to rev {jaq at booty-20060412062338-13349ccb65564b4c}
doing merge() with no base_revision specified
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'question']
lookup path [u'question']
lookup path [u'hello']
WARNING Text conflict in question
WARNING Text conflict in hello
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'question']
wrote working inventory
lookup path [u'hello']
lookup path [u'hello.BASE']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.BASE']
lookup path [u'question.OTHER']
lookup path [u'question.THIS']
INFO 2 conflicts encountered.
errors:
bzr: WARNING: Text conflict in question
bzr: WARNING: Text conflict in hello
2 conflicts encountered.
run bzr: remerge
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
lookup path [u'hello']
lookup path [u'hello.BASE']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.BASE']
lookup path [u'question.OTHER']
lookup path [u'question.THIS']
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'hello.BASE']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.BASE']
lookup path [u'question.OTHER']
lookup path [u'question.THIS']
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'question']
wrote working inventory
lookup path [u'hello']
lookup path [u'question']
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'question']
lookup path [u'question']
lookup path [u'hello']
WARNING Text conflict in question
WARNING Text conflict in hello
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'question']
wrote working inventory
lookup path [u'hello']
lookup path [u'hello.BASE']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.BASE']
lookup path [u'question.OTHER']
lookup path [u'question.THIS']
INFO 2 conflicts encountered.
errors:
/home/jaq/src/bzr/bzr.dev/bzrlib/builtins.py:1946: DeprecationWarning: bzrlib.workingtree.WorkingTree.iter_conflicts was deprecated in version 0.8.
restore_files = list(tree.iter_conflicts())
bzr: WARNING: Text conflict in question
bzr: WARNING: Text conflict in hello
2 conflicts encountered.
run bzr: remerge jello --merge-type weave
got option '--merge-type'
not a branch in: u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/jello/' Not a branch: /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/jello/
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
lookup path [u'jello']
ERROR jello is not versioned
Traceback (most recent call last):
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 650, in run_bzr_catch_errors
return run_bzr(argv)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 612, in run_bzr
ret = run(*run_argv)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 246, in run_argv_aliases
return self.run(**all_cmd_args)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/builtins.py", line 1937, in run
raise NotVersionedError(filename)
NotVersionedError: jello is not versioned
errors:
bzr: ERROR: jello is not versioned
run bzr: remerge hello --merge-type weave
got option '--merge-type'
not a branch in: u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/hello/' Not a branch: /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/hello/
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
lookup path [u'hello']
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
lookup path [u'hello']
lookup path [u'hello.BASE']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.BASE']
lookup path [u'question.THIS']
lookup path [u'hello']
lookup path [u'hello']
lookup path [u'hello.BASE']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.BASE']
lookup path [u'question.THIS']
lookup path [u'hello']
lookup path [u'hello']
wrote working inventory
lookup path [u'hello']
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
lookup path [u'hello']
lookup path [u'question']
lookup path [u'question.BASE']
lookup path [u'question.THIS']
lookup path [u'hello']
lookup path [u'hello']
WARNING Text conflict in hello
lookup path [u'hello']
lookup path [u'question']
lookup path [u'question.BASE']
lookup path [u'question.THIS']
lookup path [u'hello']
lookup path [u'hello']
wrote working inventory
lookup path [u'hello']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
INFO 1 conflicts encountered.
errors:
bzr: WARNING: Text conflict in hello
1 conflicts encountered.
run bzr: file-id hello
not a branch in: u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/hello/' Not a branch: /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/hello/
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
lookup path [u'hello']
output:
hello-20060412062337-f4e04f9349175c48
run bzr: file-id hello.THIS
not a branch in: u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/hello.THIS/' Not a branch: /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/hello.THIS/
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
lookup path [u'hello.THIS']
ERROR u'hello.THIS' is not a versioned file
Traceback (most recent call last):
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 650, in run_bzr_catch_errors
return run_bzr(argv)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 612, in run_bzr
ret = run(*run_argv)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 246, in run_argv_aliases
return self.run(**all_cmd_args)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 622, in ignore_pipe
result = func(*args, **kwargs)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/builtins.py", line 791, in run
raise BzrError("%r is not a versioned file" % filename)
BzrError: u'hello.THIS' is not a versioned file
errors:
bzr: ERROR: u'hello.THIS' is not a versioned file
run bzr: remerge --merge-type weave
got option '--merge-type'
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
lookup path [u'hello']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.BASE']
lookup path [u'question.THIS']
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.BASE']
lookup path [u'question.THIS']
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'question']
wrote working inventory
lookup path [u'hello']
lookup path [u'question']
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'question']
lookup path [u'question']
lookup path [u'hello']
WARNING Text conflict in question
WARNING Text conflict in hello
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'question']
wrote working inventory
lookup path [u'hello']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.OTHER']
lookup path [u'question.THIS']
INFO 2 conflicts encountered.
errors:
bzr: WARNING: Text conflict in question
bzr: WARNING: Text conflict in hello
2 conflicts encountered.
run bzr: remerge . --merge-type weave --show-base
got option '--merge-type'
got option '--show-base'
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
lookup path []
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
lookup path [u'hello']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.OTHER']
lookup path [u'question.THIS']
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.OTHER']
lookup path [u'question.THIS']
lookup path [u'hello']
lookup path [u'question']
lookup path [u'hello']
lookup path [u'question']
wrote working inventory
lookup path [u'hello']
lookup path [u'question']
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
ERROR Showing base is not supported for this merge type. <class 'bzrlib.merge.WeaveMerger'>
Traceback (most recent call last):
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 650, in run_bzr_catch_errors
return run_bzr(argv)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 612, in run_bzr
ret = run(*run_argv)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 246, in run_argv_aliases
return self.run(**all_cmd_args)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/builtins.py", line 1960, in run
reprocess=reprocess)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 892, in merge_inner
return merger.do_merge()
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 252, in do_merge
raise BzrError("Showing base is not supported for this"
BzrError: Showing base is not supported for this merge type. <class 'bzrlib.merge.WeaveMerger'>
errors:
bzr: ERROR: Showing base is not supported for this merge type. <class 'bzrlib.merge.WeaveMerger'>
run bzr: remerge . --merge-type weave --reprocess
got option '--merge-type'
got option '--reprocess'
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
lookup path []
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
lookup path [u'hello']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.OTHER']
lookup path [u'question.THIS']
lookup path [u'hello']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.OTHER']
lookup path [u'question.THIS']
wrote working inventory
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
ERROR exceptions.NameError: global name 'merge_type' is not defined
at /home/jaq/src/bzr/bzr.dev/bzrlib/merge.py line 247
in do_merge
Traceback (most recent call last):
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 650, in run_bzr_catch_errors
return run_bzr(argv)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 612, in run_bzr
ret = run(*run_argv)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 246, in run_argv_aliases
return self.run(**all_cmd_args)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/builtins.py", line 1960, in run
reprocess=reprocess)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 892, in merge_inner
return merger.do_merge()
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 247, in do_merge
raise BzrError("Reprocess is not supported for this merge"
NameError: global name 'merge_type' is not defined
errors:
bzr: ERROR: exceptions.NameError: global name 'merge_type' is not defined
at /home/jaq/src/bzr/bzr.dev/bzrlib/merge.py line 247
in do_merge
run bzr: remerge . --show-base --reprocess
got option '--show-base'
got option '--reprocess'
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
lookup path []
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
lookup path [u'hello']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.OTHER']
lookup path [u'question.THIS']
lookup path [u'hello']
lookup path [u'hello.OTHER']
lookup path [u'hello.THIS']
lookup path [u'question']
lookup path [u'question.OTHER']
lookup path [u'question.THIS']
wrote working inventory
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
ERROR Can't reprocess and show base.
Reprocessing obscures relationship of conflicting lines to base.
Traceback (most recent call last):
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 650, in run_bzr_catch_errors
return run_bzr(argv)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 612, in run_bzr
ret = run(*run_argv)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 246, in run_argv_aliases
return self.run(**all_cmd_args)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/builtins.py", line 1960, in run
reprocess=reprocess)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 892, in merge_inner
return merger.do_merge()
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 254, in do_merge
merge = self.merge_type(pb=self._pb, **kwargs)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 362, in __init__
file_status = self.merge_contents(file_id)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 558, in merge_contents
self.text_merge(file_id, trans_id)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 617, in text_merge
self.tt.create_file(merge3_iterator, trans_id)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/transform.py", line 245, in create_file for segment in contents:
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 609, in iter_merge3
reprocess=self.reprocess):
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge3.py", line 87, in merge_lines
raise CantReprocessAndShowBase()
CantReprocessAndShowBase: Can't reprocess and show base.
Reprocessing obscures relationship of conflicting lines to base.
errors:
bzr: ERROR: Can't reprocess and show base.
Reprocessing obscures relationship of conflicting lines to base.
run bzr: remerge hello --show-base
got option '--show-base'
not a branch in: u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/hello/' Not a branch: /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/hello/
opening working tree u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/'
got branch format Bazaar-NG branch format 4
lookup path [u'hello']
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
cache hit for revision-history in BzrBranch(u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/')
ERROR This tree contains left-over files from a failed operation.
Please examine /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/.bzr/limbo to see if it contains any files you wish to
keep, and delete it when you are done.
Traceback (most recent call last):
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 650, in run_bzr_catch_errors
return run_bzr(argv)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 612, in run_bzr
ret = run(*run_argv)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/commands.py", line 246, in run_argv_aliases
return self.run(**all_cmd_args)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/builtins.py", line 1944, in run
transform_tree(tree, tree.basis_tree(), interesting_ids)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 81, in transform_tree
interesting_ids=interesting_ids, this_tree=from_tree)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 892, in merge_inner
return merger.do_merge()
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 254, in do_merge
merge = self.merge_type(pb=self._pb, **kwargs)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/merge.py", line 354, in __init__
self.tt = TreeTransform(working_tree, self.pb)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/transform.py", line 86, in __init__
raise ExistingLimbo(self._limbodir)
ExistingLimbo: This tree contains left-over files from a failed operation.
Please examine /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/.bzr/limbo to see if it contains any files you wish to
keep, and delete it when you are done.
errors:
bzr: ERROR: This tree contains left-over files from a failed operation.
Please examine /home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/.bzr/limbo to see if it contains any files you wish to
keep, and delete it when you are done.
/home/jaq/src/bzr/bzr.dev/bzrlib/lock.py:62: UserWarning: lock on <open file u'/home/jaq/src/bzr/bzr.dev/test0000.tmp/blackbox.test_too_much.TestCommands.test_remerge/this/.bzr/branch-lock', mode 'wb' at 0xb335b5c0> not released
warn("lock on %r not released" % self.f)
^^^^[log from bzrlib.tests.blackbox.test_too_much.TestCommands.test_remerge]--
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/jaq/src/bzr/bzr.dev/bzrlib/tests/blackbox/test_too_much.py", line 743, in test_remerge
self.runbzr('remerge hello --show-base', retcode=1)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/tests/blackbox/__init__.py", line 88, in runbzr
return self.run_bzr_captured(args, retcode=retcode)
File "/home/jaq/src/bzr/bzr.dev/bzrlib/tests/__init__.py", line 484, in run_bzr_captured
self.assertEquals(result, retcode)
AssertionError: 3 != 1
----------------------------------------------------------------------
Ran 1996 tests in 1591.146s
FAILED (failures=1)
Deleting test root /home/jaq/src/bzr/bzr.dev/test0000.tmp...
tests failed
booty%
More information about the bazaar
mailing list