Comment 5 for bug 355964

Oh, apparently the goal here was to simply switch a lightweight checkout (which didn't have any uncommitted changes)? The original tree/branch had proposal.tex (in a directory), and the target branch doesn't have that file or the directory, AIUI. If so, it's pretty that bad that bzr has given a bunch of conflicts and other noise rather than just deleting the directory and file as desired.