From: Andrew Dunstan <andrew.dunstan@2ndquadrant.com>
Subject: Re: git failures
To: Stephen Frost <sfrost@snowman.net>, Tom Lane <tgl@sss.pgh.pa.us>
References: <ede85945-5151-3874-dde6-ff35b8dd76f0@2ndQuadrant.com>
 <21316.1483482102@sss.pgh.pa.us>
 <9f59fc87-2694-f4a3-bd26-66c9d3362e7d@2ndQuadrant.com>
 <CAOuzzgqT7LQyn+bUKp_b8p2DGGqYk5TwAH7zWgGOUZXCkVX-PQ@mail.gmail.com>
 <24537.1483493090@sss.pgh.pa.us>
 <CAOuzzgrxBcMiZLNyB3w61303fTR0ovC-r8Z1dGspGrsrK7kS8g@mail.gmail.com>
Cc: buildfarm-members@postgresql.org, craig@2ndquadrant.com,
 glyn.astill@seetickets.com
Message-ID: <c4c175f8-5d2e-9e05-a9e3-e344db55e434@2ndQuadrant.com>
Date: Tue, 3 Jan 2017 21:15:15 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.0
MIME-Version: 1.0
In-Reply-To: 
 <CAOuzzgrxBcMiZLNyB3w61303fTR0ovC-r8Z1dGspGrsrK7kS8g@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
Sender: buildfarm-members-owner@postgresql.org


On 01/03/2017 08:32 PM, Stephen Frost wrote:
>
> On Tue, Jan 3, 2017 at 20:25 Tom Lane <tgl@sss.pgh.pa.us 
> <mailto:tgl@sss.pgh.pa.us>> wrote:
>
>     Stephen Frost <sfrost@snowman.net <mailto:sfrost@snowman.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


-- 
Sent via buildfarm-members mailing list (buildfarm-members@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/buildfarm-members