On Mon, Jun 4, 2018 at 10:04 PM, Dave Page <dpage@pgadmin.org> wrote:HiCan 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 .gitignorediff --git a/.gitignore b/.gitignoreindex 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+!/*/*.sqlAnd, 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 VashiEnterpriseDB INDIA: Enterprise PostgreSQL Companyhttp://www.linkedin.com/in/asheshvashi Thanks.-- Dave PageBlog: http://pgsnake.blogspot.comTwitter: @pgsnakeEnterpriseDB UK: http://www.enterprisedb.comThe Enterprise PostgreSQL Company
HiCan you review the attached please Ashesh?
$ git diff .gitignorediff --git a/.gitignore b/.gitignoreindex 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
$ 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.
--
Thanks & Regards,Ashesh VashiEnterpriseDB INDIA: Enterprise PostgreSQL Company
http://www.linkedin.com/in/asheshvashi
Thanks.-- Dave PageBlog: http://pgsnake.blogspot.comTwitter: @pgsnakeEnterpriseDB UK: http://www.enterprisedb.comThe Enterprise PostgreSQL Company
pgadmin-hackers by date:
Соглашаюсь с условиями обработки персональных данных