nixpkgs/pkgs
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
..
applications Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
build-support Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
common-updater
data Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
desktops Merge pull request #101579 from worldofpeace/fix-pantheon-session 2020-10-24 13:20:12 -04:00
development Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
games Merge pull request #101614 from rnhmjoj/arx 2020-10-25 09:43:28 +01:00
misc Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 2020-10-25 09:41:51 +01:00
os-specific Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
pkgs-lib pkgs-lib/tests/formats: improve message on failure 2020-10-19 21:46:08 +02:00
servers Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
shells Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
stdenv Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
test Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
tools Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
top-level Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00