2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-29 09:04:17 +00:00
nixpkgs/pkgs/tools
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
..
admin salt: 3001.1 -> 3002 2020-10-23 19:48:48 +02:00
archivers treewide: fix redirected urls (run 3) 2020-10-02 09:01:35 -07:00
audio treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
backup bacula: fix build on darwin () 2020-10-25 00:04:37 -04:00
bluetooth
bootloaders/refind
cd-dvd
compression Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
filesystems Merge pull request from makefu/pkgs/mergerfs/update 2020-10-23 09:05:41 +02:00
graphics Merge pull request from r-ryantm/auto-update/gifski 2020-10-18 07:28:59 -05:00
inputmethods Merge pull request from r-ryantm/auto-update/ibus-hangul 2020-10-22 10:43:08 +02:00
misc Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
networking Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
nix nix-output-monitor: 0.1.0.0 -> 0.1.0.2 2020-10-18 18:59:32 +02:00
package-management Merge pull request from r-ryantm/auto-update/cargo-release 2020-10-23 14:26:13 -07:00
security Revert "Merge : libraw: 0.20.0 -> 0.20.2" 2020-10-25 09:41:51 +01:00
system bpytop: 1.0.42 -> 1.0.44 2020-10-22 12:41:54 +00:00
text basex: fix build 2020-10-25 08:12:25 +01:00
toml2nix
typesetting auctex: 12.2 -> 12.3 2020-10-24 23:17:49 -07:00
video bento4: 1.5.1-629 -> 1.6.0-637 2020-10-04 15:02:44 +02:00
virtualization treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
wayland wtype: init at 2020-09-14 2020-09-27 18:36:34 -04:00
X11 ckbcomp: 1.196 -> 1.197 2020-10-25 09:43:14 +01:00