- $mode = undef;
- $differs |= $ok ? D_PAT_ADD : D_PAT_OTH;
- });
- die "mysterious debian/patches changes $x..$y"
- unless $differs & (D_PAT_ADD|D_PAT_OTH);
- }
+
+ my $xp = $ix && "$xd/patches";
+ my $yp = $iy && "$yd/patches";
+ trees_diff_walk $xp, $yp, sub {
+ my ($n,$ix,$iy) = @_;
+
+ # analyse difference in debian/patches
+
+ my $ok;
+ if ($n !~ m/\.series$/s && !$ix && $plain->($iy)) {
+ $ok = 1;
+ } elsif ($n eq 'series' && $plain->($ix) && $plain->($iy)) {
+ my $x_s = (git_cat_file "$xp/series", 'blob');
+ my $y_s = (git_cat_file "$yp/series", 'blob');
+ chomp $x_s; $x_s .= "\n";
+ $ok = $x_s eq substr($y_s, 0, length $x_s);
+ } else {
+ # nope
+ }
+ $differs |= $ok ? D_PAT_ADD : D_PAT_OTH;
+ };
+ };
+ };