merge preview doesn't handle kind change from directory to symlink: "exceptions.AttributeError: children"
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Medium
|
Unassigned |
Bug Description
"bzr merge --preview --force" fails with the following traceback.
I have to use "--force" because of local changes (workaround advised in bug 207512).
Additionally, this crash seems to leave the lock behind.
I've archived the branch(es), in case you need more information.
$ bzr merge --preview --force
Merging from remembered location /home/daniel/
bzr: ERROR: exceptions.
Traceback (most recent call last):
File "/usr/lib/
return run_bzr(argv)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/usr/lib/
return self._do_
File "/usr/lib/
tt = tree_merger.
File "/usr/lib/
self.
File "/usr/lib/
lambda t, c: conflict_pass(t, c, self.other_tree))
File "/usr/lib/
conflicts = tt.find_conflicts()
File "/usr/lib/
self.
File "/usr/lib/
list(
File "/usr/lib/
for child in self._tree.
AttributeError: children
bzr 1.5 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'merge', '--preview', '--force']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'de_DE.UTF-8'
plugins:
builddeb /usr/lib/
bzrtools /usr/lib/
gtk /usr/lib/
launchpad /usr/lib/
qbzr /usr/lib/
rebase /usr/lib/
tags: | added: merge |
tags: | added: check-for-breezy |
tags: | removed: check-for-breezy |
Hi,
Thanks for the bug report. Have any kind changes
occured between the two branches? That is, has a directory
changed to a file in one branch?
Thanks,
James