Bug#941762: lintian in Stretch backports contains leftover from merge
On Tue, 05 Nov 2019 10:15:29 -0800 "Chris Lamb" <lamby@debian.org> wrote:
> > lintian in Stretch backports contains leftover from merge
>
> This was fixed in 2.25.0~bpo9+1 or thereabouts; I simply neglected to
> close it. Thanks for reporting…
Not really:
$ COLUMNS=70 git diff 2.33.0..2.33.0_bpo9+1 --stat
checks/fields.pm | 1224 ++++++++++++++++++++++++++++++++++++++++++++
debian/changelog | 282 ++++++++++
2 files changed, 1506 insertions(+)
$ grep -En '<<<<|====|>>>>' checks/fields.pm
36:<<<<<<< HEAD
487:<<<<<<< HEAD
492:=======
495:>>>>>>> 2.22.0
583:=======
584:>>>>>>> 2.24.0
613:<<<<<<< HEAD
1209:=======
1212:>>>>>>> 2.24.0
but it is no longer a problem, since checks/fields.pm is no longer used
and should simply be deleted from the stretch-backports branch.
Andreas
Reply to: