Re: Multiple head revisions after git pull (2.0rc1 --> 2.0)

thanks for the answer.
flask won't give me a history, i get the same error (multiple head
revisions).
I've looked into the flask manual, and tried some things that the message
suggests, like FLASK_APP=pgAdmin4.py flask db revision --head master(at)head
But that doesn't help, still the same error.
I don't mind doing a hard reset or anything. Is there a trick to get this
back on track?

Cheers,
Willy-Bas

On Thu, Nov 2, 2017 at 12:07 PM, Murtuza Zabuawala <
murtuza(dot)zabuawala(at)enterprisedb(dot)com> wrote:

> I suspect you have some local revisions, Could you run below command and
> see if you have any local revisions?
>
> ../web$ FLASK_APP=pgAdmin4.py flask db history
>
> You can compare it with what we(pgadmin4) have in revision history,
> ...
> ...
> d85a62333272 -> ef590e979b0d (head), empty message
> f195f9a4923d -> d85a62333272, empty message
> 3c1e4b6eda55 -> f195f9a4923d, Encrypt the existing user password.
> 09d53fca90c7 -> 3c1e4b6eda55, empty message
> fdc58d9bd449 -> 09d53fca90c7, Update DB to version 14
> <base> -> fdc58d9bd449, Initial database creation
>
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>
> On Thu, Nov 2, 2017 at 3:37 PM, Willy-Bas Loos <willybas(at)gmail(dot)com> wrote:
>
>> Just to clarify, this is not a git question
>>
>> Op 1 nov. 2017 12:19 p.m. schreef "Willy-Bas Loos" <willybas(at)gmail(dot)com>:
>>
>>> Hi,
>>>
>>> After my stash & pull to upgrade from 2.0rc1 to 2.0, these commands both
>>> end in the error below.
>>>
>>> - ../web$ FLASK_APP=pgAdmin4.py flask db revision
>>> - ../web$ python pgAdmin4.py
>>>
>>>
>>> File "/home/wbloos/.virtualenvs/pgadmin4/lib/python3.5/site-packa
>>> ges/alembic/script/revision.py", line 270, in get_current_head
>>> "%s(at)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
>>>
>>> I use Version: webpack 3.6.0
>>>
>>> Any tips?
>>>
>>> Cheers,
>>> --
>>> Willy-Bas Loos
>>>
>>
>

--
Willy-Bas Loos