nixpkgs/pkgs/development/libraries/mesa
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
..
default.nix Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
disk_cache-include-dri-driver-path-in-cache-key.patch Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
missing-includes.patch Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
opencl-install-dir.patch mesa: build with meson 2019-06-26 18:32:44 -04:00
stubs.nix mesa: 19.2.1 -> 19.2.3 2019-11-09 10:34:50 +00:00