| 2007-07-22 10:59:47 |
Wouter van Heyst |
description |
#!/bin/bash
rm -fr bug
mkdir bug
cd bug
bzr init base
cd base
echo blabla > a
bzr add a
bzr commit -m 'Adding a'
cd ..
bzr branch base branch
cd base
# bzr mv a b
echo talk properly > a
cd ../branch
bzr merge --uncommitted ../base
I first encounter the problem while renaming a file (see the commented out command above), but even just changing the content triggers the bug. |
#!/bin/bash
rm -fr bug
mkdir bug
cd bug
bzr init base
cd base
echo blabla > a
bzr add a
bzr commit -m 'Adding a'
cd ..
bzr branch base branch
cd base
# bzr mv a b
echo talk properly > a
cd ../branch
bzr merge --uncommitted ../base
Results in:
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 |
|
