The problem is that running the given script issues a trace back:
added a
added a
Committed revision 1.
Branched 1 revision(s).
M a
All changes applied successfully.
bzr: ERROR: exceptions.TypeError: sequence item 2: expected string, NoneType found
Traceback (most recent call last):
File "/v/home/vila/src/bzr.dev/bzrlib/commands.py", line 729, in run_bzr_catch_errors
return run_bzr(argv)
File "/v/home/vila/src/bzr.dev/bzrlib/commands.py", line 691, in run_bzr
ret = run(*run_argv)
File "/v/home/vila/src/bzr.dev/bzrlib/commands.py", line 389, in run_argv_aliases
return self.run(**all_cmd_args)
File "/v/home/vila/src/bzr.dev/bzrlib/builtins.py", line 2738, in run
change_reporter=change_reporter)
File "/v/home/vila/src/bzr.dev/bzrlib/builtins.py", line 3804, in _merge_helper
merger.set_pending()
File "/v/home/vila/src/bzr.dev/bzrlib/merge.py", line 168, in set_pending
self._add_parent()
File "/v/home/vila/src/bzr.dev/bzrlib/merge.py", line 183, in _add_parent
allow_leftmost_as_ghost=True)
File "/v/home/vila/src/bzr.dev/bzrlib/mutabletree.py", line 52, in tree_write_locked
self.unlock()
File "/v/home/vila/src/bzr.dev/bzrlib/workingtree_4.py", line 1121, in unlock
self.flush()
File "/v/home/vila/src/bzr.dev/bzrlib/workingtree_4.py", line 312, in flush
self.current_dirstate().save()
File "/v/home/vila/src/bzr.dev/bzrlib/dirstate.py", line 1728, in save
self._state_file.writelines(self.get_lines())
File "/v/home/vila/src/bzr.dev/bzrlib/dirstate.py", line 1221, in get_lines
lines.append(self._get_parents_line(self.get_parent_ids()))
File "/v/home/vila/src/bzr.dev/bzrlib/dirstate.py", line 1233, in _get_parents_line
return '\0'.join([str(len(parent_ids))] + parent_ids)
TypeError: sequence item 2: expected string, NoneType found
** please send this report to <email address hidden>
/v/home/vila/src/bzr.dev/bzrlib/lockable_files.py:110: UserWarning: file group LockableFiles(<bzrlib.transport.local.LocalTransport url=file:///home/vila/tmp/bug/branch/.bzr/checkout/>) was not explicitly unlocked
warn("file group %r was not explicitly unlocked" % self)
/v/home/vila/src/bzr.dev/bzrlib/lock.py:79: UserWarning: lock on <open file u'/home/vila/tmp/bug/branch/.bzr/checkout/dirstate', mode 'rb+' at 0xb777f7b8> not released
warn("lock on %r not released" % self.f)
Yes, sorry about that.
The problem is that running the given script issues a trace back:
added a TypeError: sequence item 2: expected string, NoneType found
added a
Committed revision 1.
Branched 1 revision(s).
M a
All changes applied successfully.
bzr: ERROR: exceptions.
Traceback (most recent call last): vila/src/ bzr.dev/ bzrlib/ commands. py", line 729, in run_bzr_ catch_errors vila/src/ bzr.dev/ bzrlib/ commands. py", line 691, in run_bzr vila/src/ bzr.dev/ bzrlib/ commands. py", line 389, in run_argv_aliases **all_cmd_ args) vila/src/ bzr.dev/ bzrlib/ builtins. py", line 2738, in run reporter= change_ reporter) vila/src/ bzr.dev/ bzrlib/ builtins. py", line 3804, in _merge_helper set_pending( ) vila/src/ bzr.dev/ bzrlib/ merge.py" , line 168, in set_pending _add_parent( ) vila/src/ bzr.dev/ bzrlib/ merge.py" , line 183, in _add_parent leftmost_ as_ghost= True) vila/src/ bzr.dev/ bzrlib/ mutabletree. py", line 52, in tree_write_locked vila/src/ bzr.dev/ bzrlib/ workingtree_ 4.py", line 1121, in unlock vila/src/ bzr.dev/ bzrlib/ workingtree_ 4.py", line 312, in flush current_ dirstate( ).save( ) vila/src/ bzr.dev/ bzrlib/ dirstate. py", line 1728, in save _state_ file.writelines (self.get_ lines() ) vila/src/ bzr.dev/ bzrlib/ dirstate. py", line 1221, in get_lines append( self._get_ parents_ line(self. get_parent_ ids())) vila/src/ bzr.dev/ bzrlib/ dirstate. py", line 1233, in _get_parents_line [str(len( parent_ ids))] + parent_ids)
File "/v/home/
return run_bzr(argv)
File "/v/home/
ret = run(*run_argv)
File "/v/home/
return self.run(
File "/v/home/
change_
File "/v/home/
merger.
File "/v/home/
self.
File "/v/home/
allow_
File "/v/home/
self.unlock()
File "/v/home/
self.flush()
File "/v/home/
self.
File "/v/home/
self.
File "/v/home/
lines.
File "/v/home/
return '\0'.join(
TypeError: sequence item 2: expected string, NoneType found
bzr 0.19.0dev0 on python 2.4.4.candidate.1 (linux2) vila/bin/ bzr', 'merge', '--uncommitted', '../base']
arguments: ['/home/
** please send this report to <email address hidden> vila/src/ bzr.dev/ bzrlib/ lockable_ files.py: 110: UserWarning: file group LockableFiles( <bzrlib. transport. local.LocalTran sport url=file: ///home/ vila/tmp/ bug/branch/ .bzr/checkout/ >) was not explicitly unlocked vila/src/ bzr.dev/ bzrlib/ lock.py: 79: UserWarning: lock on <open file u'/home/ vila/tmp/ bug/branch/ .bzr/checkout/ dirstate' , mode 'rb+' at 0xb777f7b8> not released
/v/home/
warn("file group %r was not explicitly unlocked" % self)
/v/home/
warn("lock on %r not released" % self.f)