{"action":"opened","issue":{"url":"https://api.github.com/repos/NixOS/nixpkgs/issues/51281","repository_url":"https://api.github.com/repos/NixOS/nixpkgs","labels_url":"https://api.github.com/repos/NixOS/nixpkgs/issues/51281/labels{/name}","comments_url":"https://api.github.com/repos/NixOS/nixpkgs/issues/51281/comments","events_url":"https://api.github.com/repos/NixOS/nixpkgs/issues/51281/events","html_url":"https://github.com/NixOS/nixpkgs/issues/51281","id":386196987,"node_id":"MDU6SXNzdWUzODYxOTY5ODc=","number":51281,"title":"A range of changes committed to staging-18.09/release-18.09 is lost","user":{"login":"alexeymuranov","id":712698,"node_id":"MDQ6VXNlcjcxMjY5OA==","avatar_url":"https://avatars3.githubusercontent.com/u/712698?v=4","gravatar_id":"","url":"https://api.github.com/users/alexeymuranov","html_url":"https://github.com/alexeymuranov","followers_url":"https://api.github.com/users/alexeymuranov/followers","following_url":"https://api.github.com/users/alexeymuranov/following{/other_user}","gists_url":"https://api.github.com/users/alexeymuranov/gists{/gist_id}","starred_url":"https://api.github.com/users/alexeymuranov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alexeymuranov/subscriptions","organizations_url":"https://api.github.com/users/alexeymuranov/orgs","repos_url":"https://api.github.com/users/alexeymuranov/repos","events_url":"https://api.github.com/users/alexeymuranov/events{/privacy}","received_events_url":"https://api.github.com/users/alexeymuranov/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-11-30T13:54:40Z","updated_at":"2018-11-30T13:54:40Z","closed_at":null,"author_association":"CONTRIBUTOR","body":"## A range of modifications committed to `staging-18.09`/`release-18.09` is lost (from both branches) due to an incorrect attempt to \"undo\" a merge.\r\n\r\nA range of modifications committed to `staging-18.09`/`release-18.09` is lost (from both branches) due to an incorrect attempt to \"undo\" a merge.\r\n\r\nCommit 3d63c05ddf6c4a19a04aed70a5d02adcfb3c7645 reverted the changes brought it by the previous merge commit 3b2944dbcbbab759804b8159186115940a801032.  Simulating \"merge reversion\" is [more complicated][1] than this.  As a result, I expect all the changes committed to `staging-18.09` from df6d40feb61 to 9110d40d20a to be lost from both `release-18.09` and `staging-18.09` (because later on `release-18.09` was merged into `staging-18.09`).\r\n\r\nI estimated that range of \"lost commits\" (from df6d40feb61 to 9110d40d20a, including both), by navigating `git log`, probably it should be double-checked.\r\n\r\nReplaying now the \"lost\" commits on top of `staging-18.09` or `release-18.09` should not be done automatically, because some changes in those commits (like Linux kernel updates) were superseded by later commits.\r\n\r\n[1]: https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt"}}
{"actor":{"display_login":"alexeymuranov"}}