uncommit fails when previous rev had deleted binary file
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
New
|
Undecided
|
Unassigned | ||
Bug Description
I'm using TortoiseBazaar 0.6.6 with Bazaar 2.5.1 on a Win7 SP1 machine.
I've a bunch of little apps that I placed under Bazaar control by turning each directory into its own standalone repository. Everything was good. But I made the mistake of adding my output directories and output files into the repository for each app. This was find for awhile, but then the output files grew in size and I decided I didn't want them in the repository any longer.
Well, I got lazy. Rather than use the Tortoise feature to tell Bazaar I was deleting the files from the repository, I just deleted them from the directory and assumed that Bazaar would figure it out. I left the output directories - I had 3 of them for different skews. One directory no longer had files in it. I updated my app and commited the changes.
But then I had this one little change before I published out, so I decided to uncommit the last rev and make the changes - I didn't want the repos growing with yet another set of output binary files.
And that's when Bazaar threw this error:
The above revision(s) will be removed.
bzr: ERROR: An inconsistent delta was supplied involving '_APK_Amazon/
reason: Unable to find block for this record. Was the parent added?
Easy enough to avoid if I stay away from uncommits. And it may not have happened if I'd marked each file as deleted before deleting it.
The side effect of this error is that the repos is now in an inconsistent state. If you view the log, the main branch shows to be split -ie Rev 5 has become 4.1.1 and the rev is tagged as 'Working Tree'. You can't revert and you also can't commit new revs because Bazaar will complain that the directory first needs to be updated.
Since I didn't have alot of time, I simply had to delete the repos and recreate it.
Hope this helps.
