[BUG] 'bzr revert' failure with no changes
John Arbash Meinel
john at arbash-meinel.com
Sun Mar 11 15:26:09 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
I'm pretty sure there was a fix proposed a while ago for this, but I
just ran:
'bzr revert' and got:
bzr: ERROR: exceptions.TypeError: 'in <string>' requires string as left
operand
The line in question is:
elif to_kind in ('file' or 'symlink') and (
Which should be
elif to_kind in ('file', 'symlink') and ...
Interestingly, it happened after I did a merge, and then did 'bzr shelve
- --all'. So there are some files which have an inventory entry, but no
disk file. The final revert ends up with entries with:
- - bzrlib/merge_directive.py
So I'm guessing we need some tests where we add a file, remove it from
disk, and then call 'bzr revert'. Which will trigger this bug.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFF9B+RJdeBCYSNAAMRAhpMAJ0SuRM/9wvhursaZ1fCtJVTgt/kiwCeIfGQ
xaHBtAB/6LoAiBCBOHaITSE=
=HRDh
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list