From d4c7e5d5f376de41120f3a9652d3770b830c57b6 Mon Sep 17 00:00:00 2001 From: "mahlon@martini.nu" Date: Mon, 2 Dec 2019 23:48:55 +0000 Subject: [PATCH] Revert an old LCS edge case fix in favor of a better one. FossilOrigin-Name: 646a3154f00651907a13fb5823ed00e3e6ca509c7457c8bb3e533fa00a6aa583 --- shelldap | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/shelldap b/shelldap index 92afdfc..60ce23a 100755 --- a/shelldap +++ b/shelldap @@ -1485,6 +1485,7 @@ sub diff { # if ( $cur_valcount == 1 ) { $e->replace( $attr => $val ); + $seen_attr{ $attr }++; } else { @@ -1509,10 +1510,6 @@ sub diff { # foreach ( $diff->Items(1) ) { my ( $attr, $val ) = $parse->( $_ ) or next; - my $cur_vals = $e->get_value( $attr, asref => 1 ) || []; - my $cur_valcount = scalar @$cur_vals; - - next if $cur_valcount == 1; next if $seen_attr{ $attr }; $self->debug("DELETE: $_"); $e->delete( $attr => [ $val ] );