Traceback on commit

[John Arbash Meinel]

Mark Shuttleworth wrote:
> Hey guys, had this happen today:
> 
> peregrine% bzr commit -m "Merge RF"             
...

>     assert candidates[ie.revision] == ie
> AssertionError

I'm pretty sure this is a known bug, dealing with our symlink handling.
(The new code path was returning the length of the symlink, the old code
expected the size to be None).

The simple fix is just:

=== modified file 'bzrlib/workingtree_4.py'
--- bzrlib/workingtree_4.py     2007-03-10 21:39:07 +0000
+++ bzrlib/workingtree_4.py     2007-03-12 19:53:04 +0000
@@ -1400,7 +1400,7 @@
                     parent_ies[(dirname + '/' + name).strip('/')] =
inv_entry
                 elif kind == 'symlink':
                     inv_entry.executable = False
-                    inv_entry.text_size = size
+                    inv_entry.text_size = None
                     inv_entry.symlink_target = utf8_decode(fingerprint)[0]
                 elif kind == 'tree-reference':
                     inv_entry.reference_revision = fingerprint or None

John
=:->