From: | Magnus Hagander <magnus(at)hagander(dot)net> |
---|---|
To: | Heikki Linnakangas <hlinnaka(at)iki(dot)fi> |
Cc: | Bruce Momjian <bruce(at)momjian(dot)us>, pgsql-committers <pgsql-committers(at)postgresql(dot)org>, PostgreSQL-development <pgsql-hackers(at)postgresql(dot)org> |
Subject: | Re: pgsql: Update copyright for 2017 |
Date: | 2017-01-03 17:57:44 |
Message-ID: | CABUevEzrD-BYtQOQ22navkoWquOC5TcqPcBS_iQ2cYqaK9_39g@mail.gmail.com |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-committers pgsql-hackers |
On Tue, Jan 3, 2017 at 6:54 PM, Heikki Linnakangas <hlinnaka(at)iki(dot)fi> wrote:
> On 01/03/2017 07:49 PM, Bruce Momjian wrote:
>
>> On Tue, Jan 3, 2017 at 06:46:32PM +0100, Magnus Hagander wrote:
>>
>>> Is this a big enough boo that we actually want to reset the master repo
>>> to get
>>> rid of it?
>>>
>>> If so, we need to do it *now* beore people get a chance to mirror it
>>> properly..
>>>
>>> Thoughts?
>>>
>>> If not, just a revert should work of course..
>>>
>>
>> OK, not sure how this happened but I think it has to do with my
>> accidentally doing a 'pull' after the changes, and doing multiple
>> branches.
>>
>> Whatever you suggest is fine --- I will wait.
>>
>
> I'm leaning for +1 for resetting. It'll be a pain for any mirrors of the
> repo, but I think the clean history is worth it.
>
>
It seems bruce pushed a whole bunch of merge conflicts, and possibly more.
I think his commit sscripts are badly broken.
I've pushed a reset to the master repo. Working on the mirror now.
--
Magnus Hagander
Me: http://www.hagander.net/
Work: http://www.redpill-linpro.com/
From | Date | Subject | |
---|---|---|---|
Next Message | Jim Nasby | 2017-01-03 17:59:27 | Re: [HACKERS] pgsql: Update copyright for 2017 |
Previous Message | Heikki Linnakangas | 2017-01-03 17:54:37 | Re: pgsql: Update copyright for 2017 |
From | Date | Subject | |
---|---|---|---|
Next Message | Jim Nasby | 2017-01-03 17:59:27 | Re: [HACKERS] pgsql: Update copyright for 2017 |
Previous Message | Jim Nasby | 2017-01-03 17:57:27 | Re: proposal: session server side variables |