| From: | Andrew Dunstan <andrew(dot)dunstan(at)2ndquadrant(dot)com> |
|---|---|
| To: | Stephen Frost <sfrost(at)snowman(dot)net>, Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> |
| Cc: | buildfarm-members(at)postgresql(dot)org, craig(at)2ndquadrant(dot)com, glyn(dot)astill(at)seetickets(dot)com |
| Subject: | Re: git failures |
| Date: | 2017-01-04 02:15:15 |
| Message-ID: | c4c175f8-5d2e-9e05-a9e3-e344db55e434@2ndQuadrant.com |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | buildfarm-members |
On 01/03/2017 08:32 PM, Stephen Frost wrote:
>
> On Tue, Jan 3, 2017 at 20:25 Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us
> <mailto:tgl(at)sss(dot)pgh(dot)pa(dot)us>> wrote:
>
> Stephen Frost <sfrost(at)snowman(dot)net <mailto:sfrost(at)snowman(dot)net>> writes:
>
> > I'm hopeful that I fixed it....
>
>
>
> For the benefit of the other people with this problem ... what did
> you do?
>
>
> I did a git pull in the REL9_2_STABLE/pgsql directory and accepted the
> merge commit message.
>
> I'm not convinced that was really the "right" or "correct" thing to
> do, but it seemed to allow subsequent git pull's without erroring or
> asking for any user interaction.
>
> Will look into it more tomorrow.
>
That didn't work for me. I removed that directory altogether, and I
expect the next buildfarm run to rebuild it cleanly.
cheers
andrew
--
Andrew Dunstan https://www.2ndQuadrant.com
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Craig Ringer | 2017-01-04 04:55:08 | Re: git failures |
| Previous Message | Stephen Frost | 2017-01-04 01:32:29 | Re: git failures |