Comment 5 for bug 194277

The attached branch should fix things for real this time, and also correct paths for branches not located at the repository root.

As the cleanup in http://bazaar.launchpad.net/~gagern/trac-bzr/bug194277/revision/80 kills quite a lot of code, I'll give people a few days to review this fix before I merge it into trunk. I'll be grateful for any testing it receives before that, though.