Hi, The bzr_difftools plugin has been updated to properly handle the locking required with the new dirstate code. The new version can be found at the usual location (see the Plugin Registry). -- Steve