Hi George On Wed, Jun 7, 2017 at 10:21 PM, George Gelashvili <ggelashv...@pivotal.io> wrote: > Hi Dave, > > I split the linting out into an intermediate commit, and rebased on top of > master.
Unfortunately, it still doesn't apply: error: patch failed: web/regression/javascript/test-main.js:1 error: removal patch leaves file contents error: web/regression/javascript/test-main.js: patch does not apply Checking patch web/regression/requirements.txt... Checking patch web/webpack.config.js... Checking patch web/webpack.test.config.js... Checking patch web/yarn.lock... error: web/yarn.lock: already exists in working directory Applied patch .gitignore cleanly. Applied patch Make.bat cleanly. Applied patch README cleanly. Applied patch pkg/mac/build.sh cleanly. Applied patch pkg/pip/build.sh cleanly. Applied patch pkg/src/build.sh cleanly. Applied patch web/.eslintrc.js cleanly. Applied patch web/karma.conf.js cleanly. Applied patch web/package.json cleanly. Applied patch web/pgAdmin4.py cleanly. Applied patch web/pgadmin/static/jsx/components.jsx cleanly. Applied patch web/pgadmin/tools/javascript/__init__.py cleanly. Applied patch web/pgadmin/tools/javascript/javascript_bundler.py cleanly. Applied patch web/pgadmin/tools/javascript/tests/__init__.py cleanly. Applied patch web/pgadmin/tools/javascript/tests/test_javascript_bundler.py cleanly. Applied patch web/regression/README cleanly. Applied patch web/regression/javascript/jasmine_capture_warnings_beforeall.js cleanly. Applied patch web/regression/requirements.txt cleanly. Applied patch web/webpack.config.js cleanly. Applied patch web/webpack.test.config.js cleanly. The second (lint update) patch is even worse, with significant number change that just don't want to apply. Clearly yarn.lock needs to be removed from there repo. Once I can apply a version of this, how should I be running the linter and the unit tests? -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers
