Diff collapsing changed in 10.6.9
!128 (merged) introduced optimizations to diff creation from rugged patches, but in doing so changed the order in which the pruning conditions are evaluated. Revert to the old behaviour, where the diff will first be declared too-large (if it meets the conditions) before attempting to collapse it