Assertion error in delta.py (_compare_trees)

Thu Mar 1 00:24:51 GMT 2007

On Wed, Feb 28, 2007 at 06:04:49PM -0600, John Arbash Meinel wrote:
> Marius Gedminas wrote:
> > First of all, thank you for the instant reply.
> > 
> 
> ...
> 
> > Are there any debs of 0.15 prereleases around?
> > 
> > Marius Gedminas
> 
> There should be one on Monday, since we will hit 0.15rc1. At the moment,
> would need to install (or run directly) from source.

The saga continues: bzr 0.15.0dev0 found a bunch of uncommitted changes
in my 'upstream' branch.  Naturally, I committed them.  I then attempted
to merge upstream into the new branch I created today (with bzr 0.11).
bzr merge succeeds, but then bzr commit barfs:

mg at pitonas:~/www/fbreader/toc-marks $ bzr st
mg at pitonas:~/www/fbreader/toc-marks $ bzr merge ../upstream/
 K  fbreader/opensimpad-0.9.0@ => fbreader/opensimpad-0.9.0/                      
 K  fbreader/openzaurus/opie@ => fbreader/openzaurus/opie/
 K  fbreader/pma400/qtopia@ => fbreader/pma400/qtopia/
 K  fbreader/qvfb@ => fbreader/qvfb/
 K  zlibrary/data/keynames.maemo-maemo2.xml@ => zlibrary/data/keynames.maemo-maemo2.xml
 K  zlibrary/data/keynames.opensimpad-0.9.0-opie.xml@ => zlibrary/data/keynames.opensimpad-0.9.0-opie.xml
 K  zlibrary/data/keynames.pdaxrom-1.1.0rc10-gtk.xml@ => zlibrary/data/keynames.pdaxrom-1.1.0rc10-gtk.xml
 K  zlibrary/data/keynames.pdaxrom-1.1.0rc10-qt.xml@ => zlibrary/data/keynames.pdaxrom-1.1.0rc10-qt.xml
 K  zlibrary/data/keynames.pdaxrom-1.1.0rc11-gtk.xml@ => zlibrary/data/keynames.pdaxrom-1.1.0rc11-gtk.xml
 K  zlibrary/data/keynames.pdaxrom-1.1.0rc11-qt.xml@ => zlibrary/data/keynames.pdaxrom-1.1.0rc11-qt.xml
 K  zlibrary/data/keynames.qvfb-opie.xml@ => zlibrary/data/keynames.qvfb-opie.xml
 K  zlibrary/data/keynames.zaurus-qtopia-240x320.xml@ => zlibrary/data/keynames.zaurus-qtopia-240x320.xml
 K  zlibrary/data/keynames.zaurus-qtopia-640x480.xml@ => zlibrary/data/keynames.zaurus-qtopia-640x480.xml
 K  zlibrary/gpe/view/gdk-pixbuf-hack.cpp@ => zlibrary/gpe/view/gdk-pixbuf-hack.cpp
 K  zlibrary/gpe/view/gdk-pixbuf-hack.h@ => zlibrary/gpe/view/gdk-pixbuf-hack.h
 K  zlibrary/include/ZLApplication.h@ => zlibrary/include/ZLApplication.h
 K  zlibrary/include/ZLDialog.h@ => zlibrary/include/ZLDialog.h
 K  zlibrary/include/ZLDialogContent.h@ => zlibrary/include/ZLDialogContent.h
 K  zlibrary/include/ZLDialogManager.h@ => zlibrary/include/ZLDialogManager.h
 K  zlibrary/include/ZLDir.h@ => zlibrary/include/ZLDir.h
 K  zlibrary/include/ZLEncodingConverter.h@ => zlibrary/include/ZLEncodingConverter.h
 K  zlibrary/include/ZLFSManager.h@ => zlibrary/include/ZLFSManager.h
 K  zlibrary/include/ZLFile.h@ => zlibrary/include/ZLFile.h
 K  zlibrary/include/ZLFileImage.h@ => zlibrary/include/ZLFileImage.h
 K  zlibrary/include/ZLFileInfo.h@ => zlibrary/include/ZLFileInfo.h
 K  zlibrary/include/ZLImage.h@ => zlibrary/include/ZLImage.h
 K  zlibrary/include/ZLImageManager.h@ => zlibrary/include/ZLImageManager.h
 K  zlibrary/include/ZLInputStream.h@ => zlibrary/include/ZLInputStream.h
 K  zlibrary/include/ZLMessage.h@ => zlibrary/include/ZLMessage.h
 K  zlibrary/include/ZLOpenFileDialog.h@ => zlibrary/include/ZLOpenFileDialog.h
 K  zlibrary/include/ZLOptionEntry.h@ => zlibrary/include/ZLOptionEntry.h
 K  zlibrary/include/ZLOptions.h@ => zlibrary/include/ZLOptions.h
 K  zlibrary/include/ZLOptionsDialog.h@ => zlibrary/include/ZLOptionsDialog.h
 K  zlibrary/include/ZLOutputStream.h@ => zlibrary/include/ZLOutputStream.h
 K  zlibrary/include/ZLPaintContext.h@ => zlibrary/include/ZLPaintContext.h
 K  zlibrary/include/ZLRunnable.h@ => zlibrary/include/ZLRunnable.h
 K  zlibrary/include/ZLSearchUtil.h@ => zlibrary/include/ZLSearchUtil.h
 K  zlibrary/include/ZLStreamImage.h@ => zlibrary/include/ZLStreamImage.h
 K  zlibrary/include/ZLStringUtil.h@ => zlibrary/include/ZLStringUtil.h
 K  zlibrary/include/ZLTime.h@ => zlibrary/include/ZLTime.h
 K  zlibrary/include/ZLUnicodeUtil.h@ => zlibrary/include/ZLUnicodeUtil.h
 K  zlibrary/include/ZLView.h@ => zlibrary/include/ZLView.h
 K  zlibrary/include/ZLXMLReader.h@ => zlibrary/include/ZLXMLReader.h
 K  zlibrary/include/ZLXMLWriter.h@ => zlibrary/include/ZLXMLWriter.h
 K  zlibrary/include/ZLZDecompressor.h@ => zlibrary/include/ZLZDecompressor.h
 K  zlibrary/include/ZLibrary.h@ => zlibrary/include/ZLibrary.h
 K  zlibrary/include/allocator.h@ => zlibrary/include/allocator.h
 K  zlibrary/include/shared_ptr.h@ => zlibrary/include/shared_ptr.h
 K  zlibrary/maemo/view/gdk-pixbuf-hack.cpp@ => zlibrary/maemo/view/gdk-pixbuf-hack.cpp
 K  zlibrary/maemo/view/gdk-pixbuf-hack.h@ => zlibrary/maemo/view/gdk-pixbuf-hack.h
All changes applied successfully.                                                 

mg at pitonas:~/www/fbreader/toc-marks $ bzr st
kind changed:
  fbreader/opensimpad-0.9.0 (symlink => directory)
  fbreader/qvfb (symlink => directory)
  fbreader/openzaurus/opie (symlink => directory)
  fbreader/pma400/qtopia (symlink => directory)
  zlibrary/data/keynames.maemo-maemo2.xml (symlink => file)
  zlibrary/data/keynames.opensimpad-0.9.0-opie.xml (symlink => file)
  zlibrary/data/keynames.pdaxrom-1.1.0rc10-gtk.xml (symlink => file)
  zlibrary/data/keynames.pdaxrom-1.1.0rc10-qt.xml (symlink => file)
  zlibrary/data/keynames.pdaxrom-1.1.0rc11-gtk.xml (symlink => file)
  zlibrary/data/keynames.pdaxrom-1.1.0rc11-qt.xml (symlink => file)
  zlibrary/data/keynames.qvfb-opie.xml (symlink => file)
  zlibrary/data/keynames.zaurus-qtopia-240x320.xml (symlink => file)
  zlibrary/data/keynames.zaurus-qtopia-640x480.xml (symlink => file)
  zlibrary/gpe/view/gdk-pixbuf-hack.cpp (symlink => file)
  zlibrary/gpe/view/gdk-pixbuf-hack.h (symlink => file)
  zlibrary/include/ZLApplication.h (symlink => file)
  zlibrary/include/ZLDialog.h (symlink => file)
  zlibrary/include/ZLDialogContent.h (symlink => file)
  zlibrary/include/ZLDialogManager.h (symlink => file)
  zlibrary/include/ZLDir.h (symlink => file)
  zlibrary/include/ZLEncodingConverter.h (symlink => file)
  zlibrary/include/ZLFSManager.h (symlink => file)
  zlibrary/include/ZLFile.h (symlink => file)
  zlibrary/include/ZLFileImage.h (symlink => file)
  zlibrary/include/ZLFileInfo.h (symlink => file)
  zlibrary/include/ZLImage.h (symlink => file)
  zlibrary/include/ZLImageManager.h (symlink => file)
  zlibrary/include/ZLInputStream.h (symlink => file)
  zlibrary/include/ZLMessage.h (symlink => file)
  zlibrary/include/ZLOpenFileDialog.h (symlink => file)
  zlibrary/include/ZLOptionEntry.h (symlink => file)
  zlibrary/include/ZLOptions.h (symlink => file)
  zlibrary/include/ZLOptionsDialog.h (symlink => file)
  zlibrary/include/ZLOutputStream.h (symlink => file)
  zlibrary/include/ZLPaintContext.h (symlink => file)
  zlibrary/include/ZLRunnable.h (symlink => file)
  zlibrary/include/ZLSearchUtil.h (symlink => file)
  zlibrary/include/ZLStreamImage.h (symlink => file)
  zlibrary/include/ZLStringUtil.h (symlink => file)
  zlibrary/include/ZLTime.h (symlink => file)
  zlibrary/include/ZLUnicodeUtil.h (symlink => file)
  zlibrary/include/ZLView.h (symlink => file)
  zlibrary/include/ZLXMLReader.h (symlink => file)
  zlibrary/include/ZLXMLWriter.h (symlink => file)
  zlibrary/include/ZLZDecompressor.h (symlink => file)
  zlibrary/include/ZLibrary.h (symlink => file)
  zlibrary/include/allocator.h (symlink => file)
  zlibrary/include/shared_ptr.h (symlink => file)
  zlibrary/maemo/view/gdk-pixbuf-hack.cpp (symlink => file)
  zlibrary/maemo/view/gdk-pixbuf-hack.h (symlink => file)
pending merges:
  Marius Gedminas 2007-03-01 bzr 0.15.0dev0 thinks I have uncommited changes. ...

mg at pitonas:~/www/fbreader/toc-marks $ bzr ci
bzr: ERROR: exceptions.AssertionError: 

Traceback (most recent call last):
  File "/home/mg/src/bzr.dev/bzrlib/commands.py", line 650, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/mg/src/bzr.dev/bzrlib/commands.py", line 612, in run_bzr
    ret = run(*run_argv)
  File "/home/mg/src/bzr.dev/bzrlib/commands.py", line 304, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/mg/src/bzr.dev/bzrlib/builtins.py", line 2064, in run
    reporter=reporter)
  File "/home/mg/src/bzr.dev/bzrlib/decorators.py", line 165, in write_locked
    return unbound(self, *args, **kwargs)
  File "/home/mg/src/bzr.dev/bzrlib/mutabletree.py", line 130, in commit
    revprops=revprops, *args, **kwargs)
  File "/home/mg/src/bzr.dev/bzrlib/commit.py", line 300, in commit
    self._populate_new_inv()
  File "/home/mg/src/bzr.dev/bzrlib/commit.py", line 610, in _populate_new_inv
    path, self.work_tree)
  File "/home/mg/src/bzr.dev/bzrlib/repository.py", line 1968, in record_entry_contents
    self.repository.get_transaction())
  File "/home/mg/src/bzr.dev/bzrlib/inventory.py", line 212, in find_previous_heads
    assert candidates[ie.revision] == ie
AssertionError

bzr 0.15.0dev0 on python 2.4.4.candidate.1 (linux2)
arguments: ['/home/mg/bin/bzr', 'ci']

** please send this report to bazaar at lists.ubuntu.com

Marius Gedminas
-- 
No sane person should use frame buffers if they have the choice.
	-- Linus Torvalds on lkml
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070301/06c763d2/attachment-0001.pgp 