Launchpad itself

Launchpad Merge Proposals are not updated when commits are squashed and forced pushed to remote

Asked by Mithun Mathew

It seems that launchpad MR does not update the diff when commits are squashed and force pushed to remote after the an MR is raised.

I see that the same MR is getting updated with the latest diff (with squashed commits) only after I raise another completely different MR for on a duplicate branch (with 1 extra commit) I create. I will then delete that new duplicate merge proposal immediately.

Am I missing some important steps to update the MR for squashed commits? I see that any regular commit is updated automatically in the diff.

Question information

Language:
English Edit question
Status:
Answered
For:
Launchpad itself Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Colin Watson (cjwatson) said : 		#1

Can you please give us an example merge proposal where you see this? Force-pushing should update preview diffs provided that the merge proposal hasn't already been marked as Merged.

Revision history for this message
Mithun Mathew (mithunmathew) said (last edit ): 		#2

In this MR the diff was not updated until I raised a completely different MR on a duplicated branch.

https://code.launchpad.net/~mithunmathew/shiner/+git/linux-shiner/+merge/444204

This MR is still undergoing review

Revision history for this message
Ines Almeida (ines-almeida) said : 		#3

I see there is a "Update scan failed" notification for that MP (just above the diff).
Can you click "Rescan" and see if that solved your issue? I don't have permissions to do it myself.

That scan failure itself was due to a bug in our system that was introduced and solved earlier this week.

Revision history for this message
Mithun Mathew (mithunmathew) said : 		#4

I no longer see that option and as I have done the work-around, I am already seeing updated diff.

PS: Even with that bug present, all my other diffs were updated with out issues back then

Revision history for this message
Ines Almeida (ines-almeida) said : 		#5

I believe that the bug that was introduced and fixed last week was the reason for the issue within that specific merge-proposal.

The scan failed while the bug wasn't fixed, but eventually someone must have clicked on "Rescan", or the system noticed it needed a rescan and updated it automatically, and now the diff updated.

The bug that started the issue was fixed, and we haven't received any other reports on this, so I think it's safe to say that this is solved

Can you help with this problem?

Provide an answer of your own, or ask Mithun Mathew for more information if necessary.

To post a message you must log in.