Comment 2 for bug 187207
Revision history for this message
| John A Meinel (jameinel) wrote Re: commit reports error when a file has been moved and then removed in the same revision | #2 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
1b1ed1a
(Get the code!)
If you tell bzr about the delete before hand it does fine (replace the rm sub/b with bzr rm sub/b).
It appears to be an interaction between the auto-unversion code and the apply delta code. It certainly does seem related to bug #187169.
The code path is slighty different, though. Specifically, we are getting a case where the code is claiming "this file is really deleted" but the record on disk claims that it was still present (which is why 'bzr rm sub/b' works, because it records it as genuinely removed.)
I'm guessing the WT.unversion() call isn't marking all references as absent, but I'll try to look into it a bit more.