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:
bzrmirror%bugzilla.org 2013-10-17 06:18:18 +00:00
parent 7351d5c660
commit 7e37ddd163
2 changed files with 5 additions and 3 deletions

View File

@ -1 +1 @@
8781
8782

View File

@ -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;
}