Revert an old LCS edge case fix in favor of a better one.
FossilOrigin-Name: 646a3154f00651907a13fb5823ed00e3e6ca509c7457c8bb3e533fa00a6aa583
This commit is contained in:
parent
7a65b31a6c
commit
d4c7e5d5f3
1 changed files with 1 additions and 4 deletions
5
shelldap
5
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 ] );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue