I did that and then bzr updated, and it considered every file in the repository to be in conflict. :(
I did that and then bzr updated, and it considered every file in the repository to be in conflict. :(