Create Task
Maniphest T8127

dolphin.git repository broken
Closed, ResolvedPublic
Actions

Description

As investigated by Nicolas on #kde-devel, the "dolphin.git" repository has a bad push of a master commit to Applications/17.12 branch.

The offending commit is 9a7569a82a29b00b0373892603791be1ab879e4d from 2018-02-14.

Since this blocks the KDE Applications 17.12.3 tagging on Monday, this needs to be resolved as soon as possible. Unfortunately, I did not check the state before committing the version update.

Please coordinate with Nicolas; he may already have taken actions.

Related Objects

cfeck created this task.Mar 2 2018, 2:47 AM
cfeck triaged this task as High priority.
Restricted Application added a subscriber: sysadmin. · View Herald TranscriptMar 2 2018, 2:47 AM
nalvarez changed the visibility from "Custom Policy" to "Public (No Login Required)".Mar 2 2018, 3:16 AM
nalvarez added subscribers: ngraham, nalvarez.

Push logs indicate:

2018-02-14.14:44:19 18393 update dolphin ngraham W refs/heads/Applications/17.12 a618383df3840d85dcd7e4ff62dc2ed02f55b0b7 9a7569a82a29b00b0373892603791be1ab879e4d

As discussed with Ben privately, I'll rollback that push.

ngraham added a comment.Mar 2 2018, 3:32 AM

Oops, I'm sorry about that. How can I help here?

nalvarez added a comment.Mar 2 2018, 6:06 AM

@ngraham is the 9a7569a82a patch (D10503) supposed to be in 17.12?

nalvarez added a comment.Mar 2 2018, 6:20 AM

I rolled back Applications/17.12 to a618383df3. It's now missing:

  • All the master commits that shouldn't have been there
  • "Add icons to Edit menu" (D10503) which I think was targeted for master only, but could be cherry-picked to 17.12 if that was the intention
  • A scripty change to a .desktop file, which I guess it will do again tomorrow
  • @cfeck's bumping of the version number to 17.12.3
nalvarez closed this task as Resolved.Mar 2 2018, 6:26 AM
nalvarez claimed this task.
  • Blocked scripty's change (fd383884bc) from being re-introduced into the repo, which hopefully prevents people from pushing this particular bad path back into 17.12.
  • Applied the version bump to .3 again.
  • Unlocked the repo.
ngraham added a comment.Mar 2 2018, 7:28 PM

It's fine to have D10503 be master-only. Sorry for the mess. I'm still not quite sure what happened. I'm pretty sure I didn't accidentally merge master into 17.12--which would have been really, really dumb--but it's possible that I was indeed really, really dumb. If so, it won't happen again.