Page MenuHomeLubuntu Development

Deal with merges
Open, Unbreak Now!Public

Description

A bug concerning the fact that lxqt-config is missing a Recommends on lxqt-config-l10n that incidentally Debian has had for a long, long time brought to my attention that we've got a lot of LXQt packages in MoM (Ubuntu's merge tool) that need to be gone through and fixed.

@The_LoudSpeaker recently did one and found that it's less than easy to get the Phabricator repos updated to match the archive if you upload before landing, so it would probably be best if we just used MoM to guide actions but actually do everything how we normally do it.

Also, I'm concerned about how we can stay updated on failing merges across the entirety of the packageset so we can keep these problems from happening in the future.

Event Timeline

wxl triaged this task as Unbreak Now! priority.Jan 16 2020, 5:20 PM
wxl created this task.
wxl updated the task description. (Show Details)
rikmills added a subscriber: rikmills.EditedJan 27 2020, 2:47 PM

it's less than easy to get the Phabricator repos updated to match the archive if you upload before landing

To be fair, it is actually very easy once you grasp what MoM merge produces, and how that relates to the changes you should sync to phab git. A tool/script similar to the Kubuntu ka-sync-archive one might be useful.

A debdiff between previous and next ubuntu versions is also pretty helpful. Can be used once you build with merge-scripts. Just used that with D73.

wxl added a comment.Jan 27 2020, 4:14 PM

BTW ka-sync-archive is here.

To clarify the goal of this task (these should probably be separate tasks but we can deal with that organically):

  1. We need to fix the merges right now!
  2. We ideally should document a process to do the merges.
  3. A nice improvement would be a way to better keep Phab and the archive synced. At the very least, a notification system.
  4. A really nice improvement would be a notification system about failed merges.
In T142#3065, @wxl wrote:
  1. A nice improvement would be a way to better keep Phab and the archive synced. At the very least, a notification system.
  2. A really nice improvement would be a notification system about failed merges.

@tsimonq2 ^^