Bug 927570: mid-air conflict fails to check all changed fields
r=dkl, a=simon git-svn-id: svn://10.0.0.236/trunk@265066 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
7351d5c660
commit
7e37ddd163
@ -1 +1 @@
|
||||
8781
|
||||
8782
|
||||
@ -136,8 +136,10 @@ if ($delta_ts) {
|
||||
if (!$do_midair) {
|
||||
foreach my $operation (@{ $vars->{'operations'} }) {
|
||||
foreach my $change (@{ $operation->{'changes'} }) {
|
||||
$do_midair = 1 if $change->{'fieldname'} ne 'cc';
|
||||
last;
|
||||
if ($change->{'fieldname'} ne 'cc') {
|
||||
$do_midair = 1;
|
||||
last;
|
||||
}
|
||||
}
|
||||
last if $do_midair;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user