bzr merge fails part way

[John Paulett]

Attached is the command output.  I was trying to merge my branch
(https://code.launchpad.net/~jp-jhcore/vcs-frenzy/trunk-jp) with the
main trunk (https://code.launchpad.net/~petesavage/vcs-frenzy/trunk).

I'm still trying to get the hang of bazaar, so it is possible that it is
my fault.

=========================

mpt at caesar:~/dev/vcs-frenzy/trunk-jp$ bzr merge
http://bazaar.launchpad.net/~petesavage/vcs-frenzy/trunk
http://bazaar.launchpad.net/~petesavage/vcs-frenzy/trunk is permanently
redirected to http://bazaar.launchpad.net/~petesavage/vcs-frenzy/trunk/
+N  GNOME_VCSFrenzyApplet.server.OTHER

+N  Makefile
+N  debian/
+N  debian/changelog
+N  debian/compat
+N  debian/control
+N  debian/copyright
+N  debian/docs
+N  debian/pycompat
+N  debian/rules
+N  debian/vcsfrenzy.dirs
+N  debian/vcsfrenzy.install
+N  vcsapplet.OTHER
+N  vcsfrenzy/
+N  vcsfrenzy/__init__.py
R   plugin/ => vcsfrenzy/plugin/
 M  vcsfrenzy/plugin/notifies.py
bzr: ERROR: exceptions.AttributeError: 'NoneType' object has no
attribute 'startswith'

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 650,
in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 612,
in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 304,
in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2585,
in run
    change_reporter=change_reporter)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3582,
in _merge_helper
    conflicts = merger.do_merge()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 311, in
do_merge
    **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 468, in
__init__
    self.cook_conflicts(fs_conflicts)
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 876, in
cook_conflicts
    this_path = pathjoin(this_parent_path, this_name)
  File "posixpath.py", line 60, in join
    if b.startswith('/'):
AttributeError: 'NoneType' object has no attribute 'startswith'

bzr 0.15.0 on python 2.5.1.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'merge',
'http://bazaar.launchpad.net/~petesavage/vcs-frenzy/trunk']

** please send this report to bazaar at lists.ubuntu.com