git-ubuntu

git-merge-changelogs and dpkg-mergechangelogs produce different results

Bug #1705251 reported by Nish Aravamudan
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
git-ubuntu
Fix Released
Undecided
Unassigned

Bug Description

The linter has complained about stray whitespace at the end of the changelog in a few cases, e.g.:

https://code.launchpad.net/~paelzer/ubuntu/+source/multipath-tools/+git/multipath-tools/+merge/327618

This appears to be due to a difference between git-merge-changelogs (git ubuntu lint) and dpkg-mergechangelogs (git ubuntu merge finish). Make the linter use the same code as the merge tool (this could eventually be consolidated).

Related branches

~nacc/git-ubuntu:use-dpkg-mergechangelogs
Robie Basak: Approve
Diff: 60 lines (+18/-12)
2 files modified
gitubuntu/git_repository.py (+1/-1)
gitubuntu/lint.py (+17/-11)
~nacc/git-ubuntu:use-dpkg-mergechangelogs
Superseded for merging into git-ubuntu:master
Robie Basak: Needs Fixing
Diff: 47 lines (+17/-11)
1 file modified
gitubuntu/lint.py (+17/-11)
Nish Aravamudan (nacc)
Changed in usd-importer:
status: New → In Progress
Nish Aravamudan (nacc)
Changed in usd-importer:
status: In Progress → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.