On Mon, Jun 4, 2018 at 10:04 PM, Dave Page <dp...@pgadmin.org> wrote:
> Hi > > Can you review the attached please Ashesh? > Hi Dave, Due to the wrong pattern in '.gitignore', it was ignoring the new file 'sql/pgagent--3.4--4.0.sql'. We should ignore only the '*.sql' in the root directory. Something like this. *$ git diff .gitignore* *diff --git a/.gitignore b/.gitignore* *index 9883354..40fe7a9 100644* *--- a/.gitignore* *+++ b/.gitignore* *@@ -6,7 +6,12 @@ CPackSourceConfig.cmake* * Makefile* * cmake_install.cmake* * install_manifest.txt* *-pgagent* *+# Ignore 'pgagent' & 'pgagent.control' in root directory only.* *+/pgagent* *+!/*/pgagent* * pgagent.control* *+!/*/pgagent.control* * *.log* *-*.sql* *+# Ignore '*.sql' files in root directory only.* *+/*.sql* *+!/*/*.sql* And, I am getting the following warning applying the patch. *$ git apply ~/Downloads/pgagent-4.0-update.diff* */Users/asheshvashi/Downloads/pgagent-4.0-update.diff:320: trailing whitespace.* *//* *warning: 1 line adds whitespace errors.* Otherwise - it looks good to me. -- Thanks & Regards, Ashesh Vashi EnterpriseDB INDIA: Enterprise PostgreSQL Company <http://www.enterprisedb.com/> *http://www.linkedin.com/in/asheshvashi <http://www.linkedin.com/in/asheshvashi>* > > Thanks. > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company >