nixpkgs/pkgs/development/libraries/openssl
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
..
1.0.2 openssl: 1.0.2p -> 1.0.2q 2018-11-20 16:51:48 +00:00
1.1 openssl: 1.1.1d -> 1.1.1f 2020-04-02 11:52:58 +02:00
chacha.nix treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
default.nix Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00