On Fri, Nov 3, 2017 at 1:14 PM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:
> Can you try following command see if that helps,
> ../web$ FLASK_APP=pgAdmin4.py flask db merge heads
>
> Given command will try to merge two conflicting heads together
> automatically.
> For more information refer alembic documentation: http://alembic.
> zzzcomputing.com/en/latest/branches.html
>
> -- Murtuza
>
>
>
That sounds and looks good and logical but it's not working
Whatever i do, i keep getting the same error.
I've attached a log, maybe it will clarify .
--
Willy-Bas Loos
(pgadmin4) wbloos@wb:~/python-files/pgadmin4/web$ FLASK_APP=pgAdmin4.py flask db merge heads
yarn run v1.3.2
warning package.json: No license field
$ yarn run linter && yarn run webpacker
warning package.json: No license field
$ yarn run eslint pgadmin/static/jsx/**/*.jsx pgadmin/static/js/selection/*.js regression/javascript/**/*.jsx regression/javascript/**/*.js *.js
warning package.json: No license field
$ /home/wbloos/python-files/pgadmin4/web/node_modules/.bin/eslint pgadmin/static/jsx/history/query_history.jsx pgadmin/static/jsx/history/query_history_detail.jsx pgadmin/static/jsx/history/query_history_entries.jsx pgadmin/static/jsx/history/query_history_entry.jsx pgadmin/static/jsx/history/query_history_entry_date_group.jsx pgadmin/static/js/selection/active_cell_capture.js pgadmin/static/js/selection/clipboard.js pgadmin/static/js/selection/column_selector.js pgadmin/static/js/selection/copy_data.js pgadmin/static/js/selection/grid_selector.js pgadmin/static/js/selection/range_boundary_navigator.js pgadmin/static/js/selection/range_selection_helper.js pgadmin/static/js/selection/row_selector.js pgadmin/static/js/selection/set_staged_rows.js pgadmin/static/js/selection/xcell_selection_model.js regression/javascript/history/query_history_spec.jsx regression/javascript/alerts/alertify_wrapper_spec.js regression/javascript/browser/generate_url_spec.js regression/javascript/browser/menu_spec.js regression/javascript/history/history_collection_spec.js regression/javascript/selection/active_cell_capture_spec.js regression/javascript/selection/column_selector_spec.js regression/javascript/selection/copy_data_spec.js regression/javascript/selection/grid_selector_spec.js regression/javascript/selection/range_boundary_navigator_spec.js regression/javascript/selection/range_selection_helper_spec.js regression/javascript/selection/row_selector_spec.js regression/javascript/selection/set_staged_rows_spec.js regression/javascript/selection/xcell_selection_model_spec.js regression/javascript/slickgrid/cell_selector_spec.js regression/javascript/sqleditor/keyboard_shortcuts_spec.js regression/javascript/sqleditor/query_tool_actions_spec.js karma.conf.js webpack.config.js webpack.shim.js webpack.test.config.js
warning package.json: No license field
$ yarn run webpack -- --config webpack.config.js --progress
warning package.json: No license field
warning From Yarn 1.0 onwards, scripts don't require "--" for options to be forwarded. In a future version, any explicit "--" will be forwarded as-is to the scripts.
$ /home/wbloos/python-files/pgadmin4/web/node_modules/.bin/webpack --config webpack.config.js --progress
10% building modules 8/9 modules 1 active .../web/pgadmin/static/scss/pgadmin.scss[hard-source:util] A child compiler (extract-text-webpack-plugin) has a
memory cache but its cache name is unknown.
HardSourceWebpackPlugin will be disabled for this child
compiler.
(node:29952) DeprecationWarning: Chunk.modules is deprecated. Use Chunk.getNumberOfModules/mapModules/forEachModule/containsModule instead.
Hash: cc167ab3da8851b0dbd9
Version: webpack 3.6.0
Time: 5259ms
Asset Size Chunks Chunk Names
img/drag-drop-rtl.png 402 bytes [emitted]
fonts/OpenSans-Regular.ttf 217 kB [emitted]
img/tree-branch.png 104 bytes [emitted]
fonts/glyphicons-halflings-regular.eot 20.1 kB [emitted]
fonts/context-menu-icons.eot 3.53 kB [emitted]
img/tree-small.png 1.47 kB [emitted]
img/tree-big.png 2.42 kB [emitted]
img/tree-small-rtl.png 1.51 kB [emitted]
img/tree-big-rtl.png 2.44 kB [emitted]
img/tree-arrow-small.png 1.6 kB [emitted]
img/tree-arrow-big.png 2.48 kB [emitted]
img/tree-arrow-small-rtl.png 1.67 kB [emitted]
img/tree-arrow-big-rtl.png 2.48 kB [emitted]
img/header-columns-bg.gif 95 bytes [emitted]
img/ui-icons_222222_256x240.png 3.42 kB [emitted]
img/ui-icons_454545_256x240.png 3.37 kB [emitted]
img/ui-bg_flat_0_aaaaaa_40x100.png 86 bytes [emitted]
fonts/glyphicons-halflings-regular.woff2 18 kB [emitted]
fonts/glyphicons-halflings-regular.woff 23.4 kB [emitted]
fonts/glyphicons-halflings-regular.ttf 45.4 kB [emitted]
fonts/glyphicons-halflings-regular.svg 109 kB [emitted]
img/glyphicons-halflings-regular.svg 84 bytes [emitted]
fonts/fontawesome-webfont.eot 166 kB [emitted]
fonts/fontawesome-webfont.woff2 77.2 kB [emitted]
fonts/fontawesome-webfont.woff 98 kB [emitted]
fonts/fontawesome-webfont.ttf 166 kB [emitted]
fonts/fontawesome-webfont.svg 444 kB [emitted] [big]
img/fontawesome-webfont.svg 75 bytes [emitted]
fonts/context-menu-icons.woff2 1.7 kB [emitted]
fonts/context-menu-icons.woff 2.18 kB [emitted]
fonts/context-menu-icons.ttf 3.32 kB [emitted]
img/load-root.gif 8.78 kB [emitted]
img/tree-check-small.png 1.93 kB [emitted]
img/tree-check-big.png 6.06 kB [emitted]
img/tree-check-small-rtl.png 2.09 kB [emitted]
img/tree-check-big-rtl.png 6.36 kB [emitted]
img/drag-drop.png 367 bytes [emitted]
fonts/SourceCodePro-Regular.ttf 121 kB [emitted]
img/load-node.gif 1.73 kB [emitted]
img/sort-desc.gif 62 bytes [emitted]
img/sort-asc.gif 60 bytes [emitted]
img/header-columns-over-bg.gif 48 bytes [emitted]
img/collapse.gif 107 bytes [emitted]
img/expand.gif 110 bytes [emitted]
img/GrpCheckboxY.png 274 bytes [emitted]
img/GrpCheckboxN.png 156 bytes [emitted]
img/ui-bg_flat_75_ffffff_40x100.png 86 bytes [emitted]
img/ui-bg_highlight-soft_75_cccccc_1x100.png 112 bytes [emitted]
img/ui-bg_glass_75_e6e6e6_1x400.png 100 bytes [emitted]
img/ui-bg_glass_75_dadada_1x400.png 100 bytes [emitted]
img/ui-bg_glass_65_ffffff_1x400.png 87 bytes [emitted]
img/ui-bg_glass_55_fbf9ee_1x400.png 93 bytes [emitted]
img/ui-bg_glass_95_fef1ec_1x400.png 93 bytes [emitted]
img/ui-icons_888888_256x240.png 3.35 kB [emitted]
img/ui-icons_2e83ff_256x240.png 3.42 kB [emitted]
img/ui-icons_cd0a0a_256x240.png 3.42 kB [emitted]
app.bundle.js 1.23 MB 0, 2, 3 [emitted] [big] app.bundle
sqleditor.js 271 kB 1, 3 [emitted] [big] sqleditor
debugger_direct.js 107 kB 2, 3 [emitted] debugger_direct
codemirror.js 4.86 kB 3 [emitted] codemirror
vendor.js 5.31 MB 4 [emitted] [big] vendor
file_utils.js 679 kB 5 [emitted] [big] file_utils
pgadmin_commons.js 463 kB 6 [emitted] [big] pgadmin_commons
pgadmin_css.js 2.6 kB 7 [emitted] pgadmin_css
style_css.js 2.6 kB 8 [emitted] style_css
pgadmin.css 92.3 kB 7 [emitted] pgadmin_css
style.css 415 kB 8 [emitted] [big] style_css
app.bundle.js.map 1.44 MB 0, 2, 3 [emitted] app.bundle
sqleditor.js.map 284 kB 1, 3 [emitted] sqleditor
debugger_direct.js.map 125 kB 2, 3 [emitted] debugger_direct
file_utils.js.map 840 kB 5 [emitted] file_utils
pgadmin_commons.js.map 560 kB 6 [emitted] pgadmin_commons
pgadmin_css.js.map 3.4 kB 7, 7 [emitted] pgadmin_css, pgadmin_css
style_css.js.map 17.7 kB 8, 8 [emitted] style_css, style_css
[486] ./pgadmin/static/scss/pgadmin.scss 41 bytes {7} [built]
[487] ./pgadmin/static/css/style.css 41 bytes {8} [built]
+ 579 hidden modules
Done in 10.18s.
Traceback (most recent call last):
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/base.py", line 143, in _catch_revision_errors
yield
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/base.py", line 334, in _upgrade_revs
revs = list(revs)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/revision.py", line 652, in _iterate_revisions
uppers = util.dedupe_tuple(self.get_revisions(upper))
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/revision.py", line 300, in get_revisions
resolved_id, branch_label = self._resolve_revision_number(id_)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/revision.py", line 441, in _resolve_revision_number
current_head = self.get_current_head(branch_label)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/revision.py", line 270, in get_current_head
"%s@head" % branch_label if branch_label else "head")
alembic.script.revision.MultipleHeads: Multiple heads are present for given argument 'head'; ef590e979b0d, 7b90813d8ffb
The above exception was the direct cause of the following exception:
Traceback (most recent call last):
File "/home/wbloos/.virtualenvs/pgadmin4/bin/flask", line 11, in <module>
sys.exit(main())
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/flask/cli.py", line 478, in main
cli.main(args=args, prog_name=name)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/flask/cli.py", line 345, in main
return AppGroup.main(self, *args, **kwargs)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/click/core.py", line 696, in main
rv = self.invoke(ctx)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/click/core.py", line 1060, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/click/core.py", line 1060, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/click/core.py", line 889, in invoke
return ctx.invoke(self.callback, **ctx.params)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/click/core.py", line 534, in invoke
return callback(*args, **kwargs)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/click/decorators.py", line 17, in new_func
return f(get_current_context(), *args, **kwargs)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/flask/cli.py", line 228, in decorator
with __ctx.ensure_object(ScriptInfo).load_app().app_context():
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/flask/cli.py", line 209, in load_app
rv = locate_app(self.app_import_path)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/flask/cli.py", line 89, in locate_app
__import__(module)
File "/home/wbloos/python-files/pgadmin4/web/pgAdmin4.py", line 67, in <module>
app = create_app()
File "/home/wbloos/python-files/pgadmin4/web/pgadmin/__init__.py", line 303, in create_app
db_upgrade(app)
File "/home/wbloos/python-files/pgadmin4/web/pgadmin/setup/db_upgrade.py", line 25, in db_upgrade
flask_migrate.upgrade(migration_folder)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/flask_migrate/__init__.py", line 244, in upgrade
command.upgrade(config, revision, sql=sql, tag=tag)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/command.py", line 254, in upgrade
script.run_env()
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/base.py", line 421, in run_env
util.load_python_file(self.dir, 'env.py')
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/util/pyfiles.py", line 93, in load_python_file
module = load_module_py(module_id, path)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/util/compat.py", line 64, in load_module_py
module_id, path).load_module(module_id)
File "/home/wbloos/python-files/pgadmin4/web/pgadmin/setup/../../migrations/env.py", line 94, in <module>
run_migrations_online()
File "/home/wbloos/python-files/pgadmin4/web/pgadmin/setup/../../migrations/env.py", line 87, in run_migrations_online
context.run_migrations()
File "<string>", line 8, in run_migrations
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/runtime/environment.py", line 817, in run_migrations
self.get_context().run_migrations(**kw)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/runtime/migration.py", line 320, in run_migrations
for step in self._migrations_fn(heads, self):
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/command.py", line 243, in upgrade
return script._upgrade_revs(revision, rev)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/base.py", line 338, in _upgrade_revs
for script in reversed(list(revs))
File "/usr/lib/python3.5/contextlib.py", line 77, in __exit__
self.gen.throw(type, value, traceback)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/base.py", line 168, in _catch_revision_errors
compat.raise_from_cause(util.CommandError(multiple_heads))
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/util/compat.py", line 117, in raise_from_cause
reraise(type(exception), exception, tb=exc_tb, cause=exc_value)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/util/compat.py", line 110, in reraise
raise value.with_traceback(tb)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/base.py", line 143, in _catch_revision_errors
yield
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/base.py", line 334, in _upgrade_revs
revs = list(revs)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/revision.py", line 652, in _iterate_revisions
uppers = util.dedupe_tuple(self.get_revisions(upper))
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/revision.py", line 300, in get_revisions
resolved_id, branch_label = self._resolve_revision_number(id_)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/revision.py", line 441, in _resolve_revision_number
current_head = self.get_current_head(branch_label)
File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packages/alembic/script/revision.py", line 270, in get_current_head
"%s@head" % branch_label if branch_label else "head")
alembic.util.exc.CommandError: 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
(pgadmin4) wbloos@wb:~/python-files/pgadmin4/web$
