I have what looks like the same problem. The key to reproducing it seems to be subdirectories.
The following example crashes bzr 2.2.2 for me on Debian testing and RHEL 5.5:
Traceback (most recent call last):
File "/usr/local/lib/python2.6/dist-packages/bzrlib/commands.py", line 912, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/commands.py", line 1112, in run_bzr
ret = run(*run_argv)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/commands.py", line 690, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/commands.py", line 705, in run
return self._operation.run_simple(*args, **kwargs)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/conflicts.py", line 160, in run
resolve(tree, file_list, action=action)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/conflicts.py", line 189, in resolve
conflict._do(action, tree)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/conflicts.py", line 415, in _do
meth(tree)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/conflicts.py", line 597, in action_take_this
self._resolve_with_cleanups(tree, 'OTHER')
File "/usr/local/lib/python2.6/dist-packages/bzrlib/conflicts.py", line 444, in _resolve_with_cleanups
op.run_simple(tt, *args, **kwargs)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/conflicts.py", line 594, in _resolve
tt.apply()
File "/usr/local/lib/python2.6/dist-packages/bzrlib/transform.py", line 1554, in apply
inventory_delta = self._generate_inventory_delta()
File "/usr/local/lib/python2.6/dist-packages/bzrlib/transform.py", line 1630, in _generate_inventory_delta
parent_file_id, file_id)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/inventory.py", line 2317, in make_entry
return factory(file_id, name, parent_id)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/inventory.py", line 537, in __init__
super(InventoryFile, self).__init__(file_id, name, parent_id)
File "/usr/local/lib/python2.6/dist-packages/bzrlib/inventory.py", line 216, in __init__
raise errors.InvalidEntryName(name=name)
InvalidEntryName: Invalid entry name: src/unexalpha.c
I have what looks like the same problem. The key to reproducing it seems to be subdirectories.
The following example crashes bzr 2.2.2 for me on Debian testing and RHEL 5.5:
mkdir test1
cd test1
mkdir src
touch 1 src/unexalpha.c
bzr init
bzr add
bzr commit -m "commit1"
cd ../
bzr branch test1 test2
cd test2
echo "test2" >> src/unexalpha.c
bzr commit -m "change"
cd ../test1
bzr remove src/unexalpha.c
bzr commit -m "remove"
bzr merge ../test2
bzr resolve src/unexalpha.c --take-this
If "unexalpha.c" is in the top-level directory, not src/, it works fine.
bzr: ERROR: bzrlib. errors. InvalidEntryNam e: Invalid entry name: src/unexalpha.c
Traceback (most recent call last): lib/python2. 6/dist- packages/ bzrlib/ commands. py", line 912, in exception_ to_return_ code lib/python2. 6/dist- packages/ bzrlib/ commands. py", line 1112, in run_bzr lib/python2. 6/dist- packages/ bzrlib/ commands. py", line 690, in run_argv_aliases **all_cmd_ args) lib/python2. 6/dist- packages/ bzrlib/ commands. py", line 705, in run .run_simple( *args, **kwargs) lib/python2. 6/dist- packages/ bzrlib/ cleanup. py", line 135, in run_simple lib/python2. 6/dist- packages/ bzrlib/ cleanup. py", line 165, in _do_with_cleanups lib/python2. 6/dist- packages/ bzrlib/ conflicts. py", line 160, in run lib/python2. 6/dist- packages/ bzrlib/ conflicts. py", line 189, in resolve _do(action, tree) lib/python2. 6/dist- packages/ bzrlib/ conflicts. py", line 415, in _do lib/python2. 6/dist- packages/ bzrlib/ conflicts. py", line 597, in action_take_this _resolve_ with_cleanups( tree, 'OTHER') lib/python2. 6/dist- packages/ bzrlib/ conflicts. py", line 444, in _resolve_ with_cleanups run_simple( tt, *args, **kwargs) lib/python2. 6/dist- packages/ bzrlib/ cleanup. py", line 135, in run_simple lib/python2. 6/dist- packages/ bzrlib/ cleanup. py", line 165, in _do_with_cleanups lib/python2. 6/dist- packages/ bzrlib/ conflicts. py", line 594, in _resolve lib/python2. 6/dist- packages/ bzrlib/ transform. py", line 1554, in apply inventory_ delta() lib/python2. 6/dist- packages/ bzrlib/ transform. py", line 1630, in _generate_ inventory_ delta lib/python2. 6/dist- packages/ bzrlib/ inventory. py", line 2317, in make_entry lib/python2. 6/dist- packages/ bzrlib/ inventory. py", line 537, in __init__ InventoryFile, self)._ _init__ (file_id, name, parent_id) lib/python2. 6/dist- packages/ bzrlib/ inventory. py", line 216, in __init__ InvalidEntryNam e(name= name)
File "/usr/local/
return the_callable(*args, **kwargs)
File "/usr/local/
ret = run(*run_argv)
File "/usr/local/
return self.run(
File "/usr/local/
return self._operation
File "/usr/local/
self.cleanups, self.func, *args, **kwargs)
File "/usr/local/
result = func(*args, **kwargs)
File "/usr/local/
resolve(tree, file_list, action=action)
File "/usr/local/
conflict.
File "/usr/local/
meth(tree)
File "/usr/local/
self.
File "/usr/local/
op.
File "/usr/local/
self.cleanups, self.func, *args, **kwargs)
File "/usr/local/
result = func(*args, **kwargs)
File "/usr/local/
tt.apply()
File "/usr/local/
inventory_delta = self._generate_
File "/usr/local/
parent_file_id, file_id)
File "/usr/local/
return factory(file_id, name, parent_id)
File "/usr/local/
super(
File "/usr/local/
raise errors.
InvalidEntryName: Invalid entry name: src/unexalpha.c
bzr 2.2.2 on python 2.6.6 (Linux- 2.6.32- 5-686-i686- with-debian- 6.0) local/bin/ bzr', 'resolve', 'src/unexalpha.c', '--take-this'] lib/python2. 6/dist- packages/ bzrlib/ plugins/ bash_completion [2.2.2] python2. 6/dist- packages/ bzrlib/ plugins/ bzrtools [2.1.0] python2. 6/dist- packages/ bzrlib/ plugins/ gtk [0.99.0dev1] lib/python2. 6/dist- packages/ bzrlib/ plugins/ launchpad [2.2.2] python2. 6/dist- packages/ bzrlib/ plugins/ loom [2.1.0] credential_ store /usr/local/ lib/python2. 6/dist- packages/ bzrlib/ plugins/ netrc_credentia l_store [2.2.2] lib/python2. 6/dist- packages/ bzrlib/ plugins/ news_merge [2.2.2] python2. 6/dist- packages/ bzrlib/ plugins/ rewrite [0.6.0] python2. 6/dist- packages/ bzrlib/ plugins/ search [1.7.0dev] python2. 6/dist- packages/ bzrlib/ plugins/ svn [1.0.3]
arguments: ['/usr/
encoding: 'ISO-8859-1', fsenc: 'ISO-8859-1', lang: 'en_US'
plugins:
bash_completion /usr/local/
bzrtools /usr/lib/
gtk /usr/lib/
launchpad /usr/local/
loom /usr/lib/
netrc_
news_merge /usr/local/
rewrite /usr/lib/
search /usr/lib/
svn /usr/lib/
*** Bazaar has encountered an internal error.