| 2009-09-30 00:58:17 |
Robert Collins |
description |
I used "bzr mv --auto" to make it find out about some refactorings I did to source code. This command completed succesfully (and properly guessed the renames), but after it a bzr status dies horribly.... The actual commands I used and the error follows:
---- Snip
jal@odeon:~/itrisbzr/vp-trunk$ bzr status
removed:
vp-soap-server/test/nl/itris/soap/server/AnnotatedCallTest.java
vp-soap-server/test/nl/itris/soap/server/ExecutorXmlTests.java
vp-soap-server/test/nl/itris/soap/server/FormatDecoderTests.java
vp-soap-server/test/nl/itris/soap/server/JaxbTest.java
vp-soap-server/test/nl/itris/soap/server/MimeDecoderTests.java
vp-soap-server/test/nl/itris/soap/server/SoapTestResponse.java
vp-soap-server/test/nl/itris/soap/server/SoapTestUtil.java
vp-soap-server/test/nl/itris/soap/server/TestHeaderParameters.java
vp-soap-server/test/nl/itris/soap/server/TestSoapContext.java
modified:
viewpoint/src/nl/itris/vp/domui/VpApplication.java
viewpoint/test/nl/itris/vp/custom/welzorg/WelzorgSoapCalls.java
vp-soap-server/src/nl/itris/soap/executor/SoapExecutor.java
vp-soap-server/src/nl/itris/soap/server/SoapServlet.java
unknown:
vp-soap-server/test/nl/itris/soap/util/
vp-soap-server/test/nl/itris/soap/server/TestAnnotatedCall.java
vp-soap-server/test/nl/itris/soap/server/TestFormatDecoders.java
vp-soap-server/test/nl/itris/soap/server/TestJaxb.java
vp-soap-server/test/nl/itris/soap/server/TestMimeDecoders.java
vp-soap-server/test/nl/itris/soap/server/TestXmlExecutor.java
jal@odeon:~/itrisbzr/vp-trunk$ bzr mv --auto
vp-soap-server/test/nl/itris/soap/server => vp-soap-server/test/nl/itris/soap/util
vp-soap-server/test/nl/itris/soap/server/AnnotatedCallTest.java => vp-soap-server/test/nl/itris/soap/server/TestAnnotatedCall.java
vp-soap-server/test/nl/itris/soap/server/ExecutorXmlTests.java => vp-soap-server/test/nl/itris/soap/server/TestXmlExecutor.java
vp-soap-server/test/nl/itris/soap/server/FormatDecoderTests.java => vp-soap-server/test/nl/itris/soap/server/TestFormatDecoders.java
vp-soap-server/test/nl/itris/soap/server/JaxbTest.java => vp-soap-server/test/nl/itris/soap/server/TestJaxb.java
vp-soap-server/test/nl/itris/soap/server/MimeDecoderTests.java => vp-soap-server/test/nl/itris/soap/server/TestMimeDecoders.java
vp-soap-server/test/nl/itris/soap/server/SoapTestResponse.java => vp-soap-server/test/nl/itris/soap/util/SoapResponseTestImpl.java
vp-soap-server/test/nl/itris/soap/server/TestHeaderParameters.java => vp-soap-server/test/nl/itris/soap/util/HeaderParametersTestImpl.java
vp-soap-server/test/nl/itris/soap/server/TestSoapContext.java => vp-soap-server/test/nl/itris/soap/util/SoapContextTestImpl.java
jal@odeon:~/itrisbzr/vp-trunk$ bzr status
bzr: ERROR: exceptions.AssertionError: Could not find target parent in wt: vp-soap-server/test/nl/itris/soap/server
parent of: (('vp-soap-server/test/nl/itris/soap/server', 'TestAnnotatedCall.java', 'annotatedcalltest.ja-20090210181554-no5v57e9wfspw9xu-1'), [('f', '', 0L, 0, 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'), ('r', 'vp-soap-server/test/nl/itris/soap/server/AnnotatedCallTest.java', 0L, 0, '')])
Traceback (most recent call last):
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 727, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 922, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 559, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 937, in ignore_pipe
result = func(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 300, in run
show_pending=(not no_pending), verbose=verbose)
File "/usr/lib/python2.6/dist-packages/bzrlib/status.py", line 118, in show_tree_status
want_unversioned=want_unversioned)
File "/usr/lib/python2.6/dist-packages/bzrlib/tree.py", line 97, in changes_from
want_unversioned=want_unversioned,
File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 138, in read_locked
result = unbound(self, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/tree.py", line 876, in compare
want_unversioned=want_unversioned)
File "/usr/lib/python2.6/dist-packages/bzrlib/delta.py", line 230, in _compare_trees
want_unversioned=want_unversioned):
File "_dirstate_helpers_c.pyx", line 1350, in _dirstate_helpers_c.ProcessEntryC.__next__
File "_dirstate_helpers_c.pyx", line 1609, in _dirstate_helpers_c.ProcessEntryC._iter_next
File "_dirstate_helpers_c.pyx", line 1211, in _dirstate_helpers_c.ProcessEntryC._process_entry
AssertionError: Could not find target parent in wt: vp-soap-server/test/nl/itris/soap/server
parent of: (('vp-soap-server/test/nl/itris/soap/server', 'TestAnnotatedCall.java', 'annotatedcalltest.ja-20090210181554-no5v57e9wfspw9xu-1'), [('f', '', 0L, 0, 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'), ('r', 'vp-soap-server/test/nl/itris/soap/server/AnnotatedCallTest.java', 0L, 0, '')])
bzr 1.14.1 on python 2.6.2 (linux2)
arguments: ['/usr/bin/bzr', 'status']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
DenyCarriageReturn /home/jal/.bazaar/plugins/DenyCarriageReturn.py [unknown]
bzrtools /usr/lib/python2.6/dist-packages/bzrlib/plugins/bzrtools [1.14]
fastimport /home/jal/.bazaar/plugins/fastimport [0.8dev]
launchpad /usr/lib/python2.6/dist-packages/bzrlib/plugins/launchpad [unknown]
netrc_credential_store /usr/lib/python2.6/dist-packages/bzrlib/plugins/netrc_credential_store [unknown]
qbzr /usr/lib/python2.6/dist-packages/bzrlib/plugins/qbzr [0.9.8]
xmloutput /usr/lib/python2.6/dist-packages/bzrlib/plugins/xmloutput [0.8.3]
*** Bazaar has encountered an internal error.
Please report a bug at https://bugs.launchpad.net/bzr/+filebug
including this traceback, and a description of what you
were doing when the error occurred.
jal@odeon:~/itrisbzr/vp-trunk$
Now I'll go on to try to fix this 8-( |
#!/bin/bash
rm -rf testrepo
bzr init testrepo
cd testrepo
mkdir a
echo 1 > a/file1.java
echo 2 > a/file2.java
echo 3 > a/file3.java
bzr add
bzr commit -m "Initial commit"
mkdir c
mv a/file1.java c/file1new.java
mv a/file2.java a/file2new.java
mv a/file3.java a/file3new.java
echo "-------- moving ---------------"
bzr mv --auto
...
a => c
a/file1.java => c/file1new.java
a/file2.java => a/file2new.java
a/file3.java => a/file3new.java
bzr: ERROR: An inconsistent delta was supplied involving u'a', 'a-id-1'
reason: This parent is not present.
|
|
