Paul Hinze wrote:
> Same problem here on bzr 2.0.0
>
> Unshelving changes with id "1".
> bzr: ERROR: exceptions.NotImplementedError: <property object at 0x97b370c>
...
> File "/usr/lib/python2.6/site-packages/bzrlib/transform.py", line 2709, in conflict_pass
> if path_tree.inventory[file_id].parent_id is None:
> File "/usr/lib/python2.6/site-packages/bzrlib/transform.py", line 1706, in inventory
> raise NotImplementedError(_PreviewTree.inventory)
> NotImplementedError: <property object at 0x97b370c>
This conflict happens during:
elif c_type == 'unversioned parent':
Which seems to say that a directory was removed. I can't tell whether
you shelved the deletion of a directory, and then added a new file. Or
whether you shelved changes to a file, and then deleted the directory.
Anyway, it might help to make it easier to track down under what
conditions it takes to trigger this.
Of course, that specific line claims that it is just trying to find out
if the given unversioned parent is the 'tree root', which could be more
easily found with:
if file_id == path_tree.path2id(''):
And doesn't have to access a '.inventory' member, and might make things
work again.
Care to try that one-line change and see if it fixes things for you?
John
=:->
status confirmed
importance medium
tags shelve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Paul Hinze wrote: NotImplementedE rror: <property object at 0x97b370c>
> Same problem here on bzr 2.0.0
>
> Unshelving changes with id "1".
> bzr: ERROR: exceptions.
...
> File "/usr/lib/ python2. 6/site- packages/ bzrlib/ transform. py", line 2709, in conflict_pass inventory[ file_id] .parent_ id is None: python2. 6/site- packages/ bzrlib/ transform. py", line 1706, in inventory rror(_PreviewTr ee.inventory) rror: <property object at 0x97b370c>
> if path_tree.
> File "/usr/lib/
> raise NotImplementedE
> NotImplementedE
This conflict happens during:
elif c_type == 'unversioned parent':
Which seems to say that a directory was removed. I can't tell whether
you shelved the deletion of a directory, and then added a new file. Or
whether you shelved changes to a file, and then deleted the directory.
Anyway, it might help to make it easier to track down under what
conditions it takes to trigger this.
Of course, that specific line claims that it is just trying to find out
if the given unversioned parent is the 'tree root', which could be more
easily found with:
if file_id == path_tree. path2id( ''):
And doesn't have to access a '.inventory' member, and might make things
work again.
Care to try that one-line change and see if it fixes things for you?
John
=:->
status confirmed enigmail. mozdev. org/
importance medium
tags shelve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAks gIA4ACgkQJdeBCY SNAAMUuwCgxzI0s nWDM7IHXwl8ZrOQ MdX3 2DZ3rHQi/ PGWGIo3Y
ObgAoLh747aEPI5
=OgM+
-----END PGP SIGNATURE-----