Hi Ashesh,
Can you please try applying given updated patch, I have manually converted file line ending to Unix format.
Regards,
Murtuza
On Tuesday 12 January 2016 10:33 AM, Murtuza Zabuawala wrote:
Hi Ashesh,
I am not sure what's wrong here as I'm able to apply the given patch with latest pull.
murtuza@debian ~/PROJECT/pgadmin4 $ git pull
Already up-to-date.
murtuza@debian ~/PROJECT/pgadmin4 $ patch -p1 < Fix_select2_disabled_property.patch
patching file web/pgadmin/browser/static/js/node.ui.js
murtuza@debian ~/PROJECT/pgadmin4 $ git diff
diff --git a/web/pgadmin/browser/static/js/node.ui.js b/web/pgadmin/browser/static/js/node.ui.js
index 76839c6..b5fa3e2 100644
And here are my git settings,
murtuza@debian ~/PROJECT/pgadmin4 $ git config -l
core.editor=vim
core.autocrlf=input
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.url=http://git.postgresql.org/git/pgadmin4.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.master.remote=origin
branch.master.merge=refs/heads/master
Regards,
Murtuza
On Monday 11 January 2016 09:36 PM, Ashesh Vashi wrote:
Hi Murtuza,
I am not able to apply the patch.
Can you please rebase the patch?
(Also - please set the proper line endings in your git repository.)