jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97e3346fbd
nixpkgs/pkgs/data/misc
History
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge 
I made a mistake merge.  Reverting it in c778945806b 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: 4effe769e2b
 - `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 (803ca85c209)
 - 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
..
adapta-backgrounds adapta-backgrounds: 0.5.2.3 -> 0.5.3.1 2019-07-04 01:49:53 -06:00
brise treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
cacert nss-cacert: add license 2020-06-27 00:54:50 +02:00
cldr-emoji-annotation cldr-emoji-annotation: 37.0_13.0_0_1 -> 37.0_13.0_0_2 2020-09-01 23:42:39 +02:00
combinatorial_designs treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
conway_polynomials treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
ddccontrol-db treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
dns-root-data dns-root-data: switch to new URL 2020-07-01 16:20:48 +02:00
elliptic_curves treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
freepats treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
geolite-legacy treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
graphs treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
hackage all-cabal-hashes: update to Hackage at 2020-10-22T01:32:08Z 2020-10-23 21:00:26 +02:00
iana-etc iana-etc: 20200407 -> 20200729 2020-08-01 09:57:46 +01:00
libkkc-data treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
mailcap nixos/nginx: use mailcap mime.types 2019-10-09 14:20:40 +00:00
media-player-info treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
mime-types treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
miscfiles treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
mobile-broadband-provider-info treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
nixos-artwork nixos-artwork: add missing wallpapers 2020-07-04 00:31:18 +02:00
osinfo-db osinfo-db: 20200529 -> 20200804 2020-08-16 23:48:40 +02:00
pari-galdata treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
pari-seadata-small treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
polytopes_db treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
poppler-data treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
publicsuffix-list treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
scowl scowl: 2018.04.16 -> 2019.10.06 2020-04-07 16:53:28 +00:00
shared-desktop-ontologies treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
shared-mime-info treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
sound-theme-freedesktop treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
spdx-license-list-data spdx-license-list-data: 3.9 -> 3.10 2020-08-11 14:29:58 +00:00
tzdata Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
unicode-character-database lib.licenses: Add Unicode License Agreement for Data Files and Software 2020-04-01 13:43:41 +00:00
unicode-emoji lib.licenses: Add Unicode License Agreement for Data Files and Software 2020-04-01 13:43:41 +00:00
unihan-database lib.licenses: Add Unicode License Agreement for Data Files and Software 2020-04-01 13:43:41 +00:00
wireless-regdb wireless-regdb: 2019.06.03 -> 2020.04.29 2020-06-07 10:53:07 +02:00
xorg-rgb treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00