Inconsistent Delta (What does this mean)

[Maritza Mendez]

Hi.  One of my coworkers encountered the following situation.
Unfortunately, I don't have the bzrlog yet, but I hope to get it from him
next week.

He's using bzr-explorer for all commands (but the issue probably would have
been the same at the command line).

bzr-explorer 0.7
bzlib 1.17
qbzr 0.14

After doing 'bzr mv' on several directories of hundreds of files, doing 'bzr
add' on about 150 files and 'bzr rm' on a coupe dozen files, he attempted
'bzr commit' and received the following error message about half-way through
the commit:

*bzr: ERROR: An inconsistent delta was supplied involving
'Project/Vendor/Tests/Unit/Offset_Test_0001234.txt',
'offset_test_00012.tx-20090731235521-vbs4brx04jp4l505-2874'\*

where I have edited the filename (but preserved the number of directory
levels and the length of the filename) to conceal proprietary data.

So without doign anything else (he says, and he's generally very reliable)
he tries to 'bzr commit' again and gets

*bzr: ERROR: Working tree is out of date, please run 'bzr update'.
*
So he does 'bzr update' and something happens, followed by bzr saying the
revno is incremented from where it was but of course he still has changes in
his working area.

Now he does 'bzr commit' and everything is fine.

What happened?  Did he respond appropriately?  How could this have gone more
smoothly?  He's a pretty calm guy and makes backups regularly.  But this
freaked him out.

It might be worth mentioning that it is likely that much of the bzr
add/rm/mv commands resulted in files being replaced with files of the same
name but different contents.

The branch format  7, repository packs 6.
2093 files in 99 directories
91 revisions (this existing project was just placed under bzr recently)

I will try to get the bzrlog on Monday.

Thanks,
~M
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090829/1cd755cf/attachment-0002.htm