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

From Dave Page
Subject Re: pgAdmin 4 - Update for Server dialog
Date
Msg-id CA+OCxowifj7Pc-Rt1vnSQyqiJDuNfB0_LeFoq51_MqUmv5ue3Q@mail.gmail.com
Whole thread Raw
In response to Re: pgAdmin 4 - Update for Server dialog  (Susan Douglas <susan.douglas@enterprisedb.com>)
List pgadmin-hackers
Thanks, patch applied.

It's probably worth updating your system to make sure you're running an up to date version of git etc. I'm not sure whether that would require an app store update or update to macports or homebrew - that depends on how your machine was originally setup.

You might also want to look at the ~/.gitconfig file on your system. This is what works for me:

(pgadmin4)piranha:pgadmin4 dpage$ more ~/.gitconfig 
[push]
        default = simple
[core]
        autocrlf = input
[user]
        name = Dave Page
        email = dpage@pgadmin.org


On Mon, Dec 18, 2017 at 10:51 AM, Susan Douglas <susan.douglas@enterprisedb.com> wrote:
Hi All,

Khushboo has helped generate the attached patch for the server_dialog.rst and pgadmin_tabbed_browser.rst changes.  When generated on my system, the patch fails, but when generated on her system, the patch applies.  In both cases, we're using the same files and commands to generate the patch.

Let me know if there are any further problems!

Thanks!

-- Susan







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





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

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

pgadmin-hackers by date:

Previous
From: Dave Page
Date:
Subject: pgAdmin 4 commit: Doc updates for server connection dialogue andrelate
Next
From: pgAdmin 4 Jenkins
Date:
Subject: Build failed in Jenkins: pgadmin4-master-python26 #554