What has been fixed is that a warning is now generated if a file helper generated for a text conflict (.OTHER, .BASE, .THIS) was (previsously) added via 'bzr add'.
I.e. bzr don't add this files blindly now, they have to be added explicitly (because we can't *forbid* that).
This should lead to *fewer* (hopefully none) .BASE/.THIS/.OTHER files being mistakenly added.
.moved can't be addressed this way since they are not *added* they are already present.
What has been fixed is that a warning is now generated if a file helper generated for a text conflict (.OTHER, .BASE, .THIS) was (previsously) added via 'bzr add'.
I.e. bzr don't add this files blindly now, they have to be added explicitly (because we can't *forbid* that).
This should lead to *fewer* (hopefully none) .BASE/.THIS/.OTHER files being mistakenly added.
.moved can't be addressed this way since they are not *added* they are already present.