This repository used to be trunk/tags/branches, but since nothing is in tags and branches anymore, and I will not be using that scheme in the future, I removed the empty branches and tags directories.
Now committing from a bzr-svn checkout crashes when it (apparently) is trying to do a PROPFIND on the branches directory. Clearing the subversion cache and removing subversion.conf doesn't help:
$ bzr commit -m "Note that some history is in CVS."
Committing to: svn+https://blowfishvhdl.svn.sourceforge.net/svnroot/blowfishvhdl/trunk
modified NEWS
bzr: ERROR: libsvn._core.SubversionException: ("PROPFIND request failed on '/svnroot/blowfishvhdl/!svn/bc/55/branches'", 175007)
Traceback (most recent call last):
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 846, in run_bzr_catch_errors
return run_bzr(argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 797, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 499, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2364, in run
author=author)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line 240, in commit
result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 197, in commit
revprops=revprops, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 387, in commit
revision_id=self.rev_id)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 953, in fetch
return inter.fetch(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts)
File "/home/wjl/.bazaar/plugins/svn/commit.py", line 791, in fetch
self.copy_content(revision_id=revision_id, pb=pb)
File "/home/wjl/.bazaar/plugins/svn/commit.py", line 755, in copy_content
while not self.target.has_revision(revision_id):
File "/home/wjl/.bazaar/plugins/svn/repository.py", line 373, in has_revision
(path, revnum, _) = self.lookup_revision_id(revision_id)
File "/home/wjl/.bazaar/plugins/svn/repository.py", line 553, in lookup_revision_id
return self.get_revmap().get_branch_revnum(revid, layout)
File "/home/wjl/.bazaar/plugins/svn/revids.py", line 172, in get_branch_revnum
for entry_revid, branch, revno, mapping in self.actual.discover_revids(layout, self.cache.last_revnum_checked(str(layout)), last_revnum):
File "/home/wjl/.bazaar/plugins/svn/revids.py", line 72, in discover_revids
for (branch, revno) in self.repos.find_fileprop_branches(layout, from_revnum, to_revnum):
File "/home/wjl/.bazaar/plugins/svn/repository.py", line 806, in find_fileprop_branches
for (project, branch, nick) in layout.get_branches(revnum):
File "/home/wjl/.bazaar/plugins/svn/mapping3/__init__.py", line 83, in get_branches
find_children):
File "/home/wjl/.bazaar/plugins/svn/mapping3/__init__.py", line 41, in expand_branch_pattern
return expand_branch_pattern(begin+[todo[0]], todo[1:], check_path, get_children)
File "/home/wjl/.bazaar/plugins/svn/mapping3/__init__.py", line 42, in expand_branch_pattern
children = get_children(path)
File "/home/wjl/.bazaar/plugins/svn/mapping3/__init__.py", line 72, in find_children
dirents = self.repository.transport.get_dir(path, revnum)[0]
File "/home/wjl/.bazaar/plugins/svn/transport.py", line 668, in get_dir
return conn.get_dir(path, revnum, pool, kind)
File "/home/wjl/.bazaar/plugins/svn/errors.py", line 107, in convert
raise convert_error(e)
SubversionException: ("PROPFIND request failed on '/svnroot/blowfishvhdl/!svn/bc/55/branches'", 175007)
bzr 1.5 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'commit', '-m', 'Note that some history is in CVS.']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
bisect /home/wjl/.bazaar/plugins/bisect [1.1.0pre0]
bzrtools /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.5.0]
gtk /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.94.0]
launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
loom /home/wjl/.bazaar/plugins/loom [1.4.0dev0]
rebase /home/wjl/.bazaar/plugins/rebase [0.3.0]
stats /home/wjl/.bazaar/plugins/stats [unknown]
svn /home/wjl/.bazaar/plugins/svn [0.4.11dev0]
*** Bazaar has encountered an internal error.
Please report a bug at https://bugs.launchpad.net/bzr/+filebug
including this traceback, and a description of what you
were doing when the error occurred.
$ cat ~/.bazaar/subversion.conf
[945dce38-bb15-0410-8f44-e019aac900f5]
locations = svn+https://blowfishvhdl.svn.sourceforge.net/svnroot/blowfishvhdl
branching-scheme = trunk0
branching-scheme-mandatory = False
$ bzr info
Checkout (format: rich-root-pack)
Location:
checkout root: .
checkout of branch: svn+https://blowfishvhdl.svn.sourceforge.net/svnroot/blowfishvhdl/trunk
$ bzr revno ~/.bazaar/plugins/svn
1179
Please let me know if I can provide more info. The repository itself is a public one available on sourceforge, so you can check out it's history if that helps. I can also give write permission if it would help for testing.
I appear to have the same problem. One (minor?) difference: unrelated projects in the same svnrepo that are missing branches or tags seem to be preventing me from committing into projects that *do* have the normal trunk/branches/tags layout.
Unfortunately, this is on my company's private repo, so I can't easily give you access for debug purposes. Basically, I've got two projects that really matter to me, and a large number of directories in the root level that don't. Many of the root level directories do not have trunk/branches/
$ head -4 /home/nevans/
[0487d25d-
locations = https:/
branching-scheme = trunk1
branching-
$ bzr info | grep branch
checkout of branch: svn+https:/
$ bzr commit -m "merged in latest from trunk"
Committing to: svn+https:/
modified ...
modified ...
modified ...
...
bzr: ERROR: libsvn.
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/
author=author)
File "/usr/lib/
return unbound(self, *args, **kwargs)
File "/usr/lib/
result = WorkingTree3.
File "/usr/lib/
return unbound(self, *args, **kwargs)
File "/usr/lib/
revprops=
File "/usr/lib/
revision_
File "/usr/lib/
return inter.fetch(
File "/home/
self.
File "/home/
while not self.target.
File "/home/
(path, revnum, _) = self.lookup_
File "/home/
return self.get_
File "/home/
for entry_revid, branch, revno, mapping in self.actual.