I've solved the missing-files problem. As I suspected, my code wasn't getting directory copy after a branch delete correctly - the problem commit was r356, where branches/Development was copied back to trunk after a trunk delete. The NUT-UPS repo continues to be a horrifyingly effective generator of strange edge cases for my testing. I'm going back to work on the merge-detection problem now. Hartmut, I'm now ready to merge your fixes as well. Can you mail me patches? -- <a href="http://www.catb.org/~esr/">Eric S. Raymond</a> He who joyfully marches to music in rank and file has already earned my contempt. He has been given a large brain by mistake, since for him the spinal cord would fully suffice. -- Albert Einstein