Re: pgAdmin 4 - Update for Server dialog - Mailing list pgadmin-hackers

On Dec 18, 2017, at 4:11 AM, Dave Page <dave.page@enterprisedb.com> wrote:

Hi

For some reason I usually find Susan's patches will only apply using "patch -p1" and not "git apply". It's very odd.

In this case, patch seems to think it's reversed (i.e. already applied):

piranha:pgadmin4 dpage$ patch -p1 < ~/Downloads/server_dialog.patch 

(Stripping trailing CRs from patch.)

patching file docs/en_US/server_dialog.rst

Reversed (or previously applied) patch detected!  Assume -R? [n]

On Fri, Dec 15, 2017 at 4:48 AM, Khushboo Vashi <khushboo.vashi@enterprisedb.com> wrote:

Hi Susan,

Now, getting another error as attached.

Thanks,

Khushboo

On Thu, Dec 14, 2017 at 5:44 PM, Susan Douglas <susan.douglas@enterprisedb.com> wrote:

> On Dec 13, 2017, at 11:39 PM, Khushboo Vashi <khushboo.vashi@enterprisedb.com> wrote:
>
> Hi susan,
>
> I am getting an error while applying the patch, attached the screen-shot for the same.
>
> Thanks,
> Khushboo
>

Hi Khushboo,

The error message is complaining about line 3 (GIT binary patch), so I regenerated the patch without the --cached --binary directives... it's attached below.  Can you try this patch?

-- Susan

--

Dave Page
VP, Chief Architect, Tools & Installers
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake