fix: merge 67da9ef1ef9c and 1412ec1e5a7b migrations

[hughhhh]

SUMMARY

Fixing the following error on master

ERROR [root] Error: Multiple head revisions are present for given argument 'head'; please specify a specific target revision, '<branchname>@head' to narrow to a specific head, or 'heads' for all heads

$ superset db history
c501b7c653a3 -> 1412ec1e5a7b (head), legacy force directed to echart
c501b7c653a3 -> 67da9ef1ef9c (head), add hide_left_bar to tabstate

$ superset db merge 67da9ef1ef9c 1412ec1e5a7b

$ superset db history
67da9ef1ef9c, 1412ec1e5a7b -> 3071e6737e92 (head) (mergepoint), empty message
c501b7c653a3 -> 67da9ef1ef9c, add hide_left_bar to tabstate

ADDITIONAL INFORMATION

• Has associated issue:
• Changes UI
• Requires DB Migration.
• Confirm DB Migration upgrade and downgrade tested.
• Introduces new feature or API
• Removes existing feature or API

[ktmud]

Since there are no new migrations after 1412ec1e5a7b, can we update the head hash for 67da9ef1ef9c to 1412ec1e5a7b instead to avoid a merge commit?

diff --git a/superset/migrations/versions/67da9ef1ef9c_add_hide_left_bar_to_tabstate.py b/superset/migrations/versions/67da9ef1ef9c_add_hide_left_bar_to_tabstate.py
index 41768c27d..c43a5b5c4 100644
--- a/superset/migrations/versions/67da9ef1ef9c_add_hide_left_bar_to_tabstate.py
+++ b/superset/migrations/versions/67da9ef1ef9c_add_hide_left_bar_to_tabstate.py
@@ -17,14 +17,14 @@
 """add hide_left_bar to tabstate
 
 Revision ID: 67da9ef1ef9c
-Revises: c501b7c653a3
+Revises: 1412ec1e5a7b
 Create Date: 2021-02-22 11:22:10.156942
 
 """
 
 # revision identifiers, used by Alembic.
 revision = "67da9ef1ef9c"
-down_revision = "c501b7c653a3"
+down_revision = "1412ec1e5a7b"
 
 import sqlalchemy as sa
 from alembic import op

[hughhhh]

@ktmud do you just want me to update the files with the diff in your comments?

[codecov]

Codecov Report

Merging #13493 (1b73491) into master (b17e7aa) will increase coverage by 8.40%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #13493      +/-   ##
==========================================
+ Coverage   63.37%   71.77%   +8.40%     
==========================================
  Files         605      804     +199     
  Lines       21251    40736   +19485     
  Branches     5530     4163    -1367     
==========================================
+ Hits        13467    29240   +15773     
- Misses       7573    11496    +3923     
+ Partials      211        0     -211     

Flag	Coverage Δ
cypress	57.90% <ø> (?)
hive	80.06% <ø> (?)
javascript	?
mysql	80.39% <ø> (?)
postgres	80.43% <ø> (?)
presto	80.09% <ø> (?)
python	80.93% <ø> (?)
sqlite	80.05% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
...uperset-frontend/src/dashboard/util/dnd-reorder.js	0.00% <0.00%> (-100.00%)	⬇️
...rset-frontend/src/dashboard/util/getEmptyLayout.js	0.00% <0.00%> (-100.00%)	⬇️
...et-frontend/src/components/Pagination/Ellipsis.tsx	0.00% <0.00%> (-100.00%)	⬇️
...-frontend/src/components/OmniContainer/Omnibar.tsx	0.00% <0.00%> (-100.00%)	⬇️
...frontend/src/components/ErrorMessage/IssueCode.tsx	0.00% <0.00%> (-100.00%)	⬇️
...rc/components/ErrorMessage/TimeoutErrorMessage.tsx	0.00% <0.00%> (-100.00%)	⬇️
...dashboard/components/resizable/ResizableHandle.jsx	0.00% <0.00%> (-100.00%)	⬇️
...tersConfigModal/Footer/CancelConfirmationAlert.tsx	0.00% <0.00%> (-100.00%)	⬇️
...ConfigModal/FiltersConfigForm/FilterScope/state.ts	0.00% <0.00%> (-100.00%)	⬇️
...c/components/ErrorMessage/DatabaseErrorMessage.tsx	0.00% <0.00%> (-94.74%)	⬇️
... and 826 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b17e7aa...c646b75. Read the comment docs.

[betodealmeida]

+1