Traceback in bzr difftools plugin when using external merge tool to compare two branches if branches contain symlinks

[Aaron Bentley]

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

Stephen Ward wrote:
> Hi,
> 
> The problem in this case is that the 'self.symlink_target' is not filled in at 
> the time '_put_on_disk()' tries to use it.

Wait-- are you exporting a working tree?  Why not just use the working
tree directly?

> === modified file 'bzrlib/inventory.py'
> --- bzrlib/inventory.py 2007-04-04 02:31:25 +0000
> +++ bzrlib/inventory.py 2007-04-27 01:54:08 +0000
> @@ -804,6 +804,7 @@
>      def _put_on_disk(self, fullpath, tree):
>          """See InventoryEntry._put_on_disk."""
>          try:
> +            self._read_tree_state(fullpath, tree)  # else target may be empty
>              os.symlink(self.symlink_target, fullpath)

I'm not sure what read_tree_state does when invoked on a RevisionTree,
but I doubt it's productive.  I'd suggest using
tree.get_symlink_target() instead.  That should work everywhere.

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

iD8DBQFGMWV90F+nu1YWqI0RAuAYAJ9TWySmhHZOFUVyTHhpp2WNniElFACcCrqK
tbZw0n0sV1MOO6VgLPct/ok=
=mVA2
-----END PGP SIGNATURE-----