Traceback in bzr difftools plugin when using external merge tool to compare two branches if branches contain symlinks
elliot at canonical.com
Fri Apr 27 05:06:54 BST 2007
On 04/26/2007 10:52 PM, Aaron Bentley wrote:
>> === 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."""
>> + 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.
I was talking to Martin a little while ago and mentioned this, and he
also suggested using tree.get_symlink_target(). And adding a test for
exporting a working tree containing a symlink.
I agree that difftools can probably just use the working tree directly
More information about the bazaar