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

2017-11-04 Thread Murtuza Zabuawala
Your pgAdmin4 repo has local alembic revisions and you have to fix it manually by removing its respective files from directory '../pgadmin4/web/migrations/versions', you can refer below given link how to do it manually OR if you are having difficulties doing it I would suggest you to git clone the

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

2017-11-03 Thread Willy-Bas Loos
Op 3 nov. 2017 21:00 schreef "Rob Lewis" : All of a sudden this list is generating lots of traffic and I would like to unsubscribe, but I can't find out how to. Please help. A bit of topic, but I think you should go to https://lists.postgresql.org/manage/

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

2017-11-03 Thread Rob Lewis
All of a sudden this list is generating lots of traffic and I would like to unsubscribe, but I can't find out how to. Please help.  On Nov 03, 2017, at 03:10 AM, Willy-Bas Loos wrote: thanks for the answer. flask won't give me a history, i get the same error (multiple head revisions). I've loo

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

2017-11-03 Thread Willy-Bas Loos
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 in

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

2017-11-03 Thread Murtuza Zabuawala
​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

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

2017-11-03 Thread Willy-Bas Loos
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@head But that doesn't help, still the same error. I do

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

2017-11-02 Thread Murtuza Zabuawala
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

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

2017-11-02 Thread Willy-Bas Loos
Just to clarify, this is not a git question Op 1 nov. 2017 12:19 p.m. schreef "Willy-Bas Loos" : > 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