[Pkg-bazaar-maint] Bug#531884: bzr-svn: AssertionError after 'bzr unshelve'

[Paul Evans]

Package: bzr-svn
Version: 0.5.3-1
Severity: normal


I have a svn checkout that I use 'bzr shelve' against. shelveing changes
works fine, but I get the following after unshelve:

----------

$ bzr unshelve
Unshelving changes with id "2".                                                                                                 
 M  TestBase.pm                                                                                                                 
 M  test.pl
bzr: ERROR: exceptions.AssertionError: 

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 716, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 911, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 547, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 5457, in run
    Unshelver.from_args(shelf_id, action).run()
  File "/usr/lib/python2.5/site-packages/bzrlib/shelf_ui.py", line 289, in run
    merger.do_merge()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 493, in do_merge
    self._do_merge_to(merge)
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 465, in _do_merge_to
    merge.do_merge()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 606, in do_merge
    results = self.tt.apply(no_conflicts=True)
  File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 1368, in apply
    self._tree.apply_inventory_delta(inventory_delta)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/workingtree.py", line 677, in apply_inventory_delta
    assert delta == []
AssertionError

bzr 1.13.1 on python 2.5.4 (linux2)
arguments: ['/usr/bin/bzr', 'unshelve']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_GB.UTF-8'
plugins:
  bzrtools             /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.13]
  dbus                 /usr/lib/python2.5/site-packages/bzrlib/plugins/dbus [0.1dev]
  gtk                  /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.96.0.dev.1]
  launchpad            /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  netrc_credential_store /usr/lib/python2.5/site-packages/bzrlib/plugins/netrc_credential_store [unknown]
  rebase               /usr/lib/python2.5/site-packages/bzrlib/plugins/rebase [0.4.4]
  svn                  /usr/lib/python2.5/site-packages/bzrlib/plugins/svn [0.5.3]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.

----------

The actual unshelve operation was successful, and the checkout area
doesn't seem otherwise damaged; both svn and bzr can happily "status"
it, for example.


-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.26-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages bzr-svn depends on:
ii  bzr                           1.13.1-1   easy to use distributed version co
ii  python                        2.5.4-2    An interactive high-level object-o
ii  python-central                0.6.11     register and build utility for Pyt
ii  python-subvertpy              0.6.5-1    Alternative Python bindings for Su

Versions of packages bzr-svn recommends:
ii  bzr-rebase                    0.4.4-1    Rebase plugin for Bazaar

bzr-svn suggests no packages.

-- no debconf information