Comment 13 for bug 855155

sorry for the late reply, but here is a zip of the branch and the server repo that I was using when all of this went down. I don't seem to be getting the InconsistentDelta error anymore, but the branch i was using around the time the error happened is still in a very weird state, it keeps saying if i do a bzr status that it found conflicts and moved the files to one place, and then found another conflict and moved it again even though there wasn't a conflict in the first place