[BUG] can't rename subtrees

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:

> the 'tree_specific_string' is either a 'packed_stat' for working trees,
> or 'last_changed_revision' for revision trees.
> 
> But 'fingerprint' is the bug. It is usually either a sha1 (files) or
> symlink target (symlinks), or '' (directories).
> 
> I think for nested trees, it could either be '', or the
> last-committed-revision (but we could always just pull that out of the
> actual nested tree).

In the same sense, we could manually determine the file sha1 or the
symlink target.  So by analogy, I think it would make sense to use the
last-committed-revision.

> This passes for me:
> === modified file 'bzrlib/dirstate.py'
> --- bzrlib/dirstate.py  2007-03-21 04:14:35 +0000
> +++ bzrlib/dirstate.py  2007-04-01 00:56:15 +0000
> @@ -1959,7 +1959,7 @@
>                  current_new_minikind = \
>                      DirState._kind_to_minikind[current_new[1].kind]
>                  if current_new_minikind == 't':
> -                    fingerprint = current_new[1].reference_revision
> +                    fingerprint = current_new[1].reference_revision or ''
>                  else:
>                      fingerprint = ''
>              else:
> 

Thanks for tracking this down.  Do you consider this a mergeable fix,
and if so, do you want to write up the merge request, or shall I?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGDyJ/0F+nu1YWqI0RAukTAJ4pQMxPhnvT/ckVsA7whuu1qyIGcgCePJ1l
uuuTvspnSnCchCDrCwcQWVg=
=dkoM
-----END PGP SIGNATURE-----