Re: [COMMITTERS] pgsql: Update copyright for 2017

[Masahiko Sawada]

On Sat, Jan 7, 2017 at 1:14 AM, Bruce Momjian  wrote:
> On Wed, Jan  4, 2017 at 10:05:10AM -0500, Tom Lane wrote:
>> Andres Freund  writes:
>> > On 2017-01-03 13:02:28 -0500, Bruce Momjian wrote:
>> >> Yeah, I was doing parallel pulls of different branches in git via shell
>> >> script, and it seems the size of this commit showed me that doesn't
>> >> work.  Sorry.
>>
>> > Shouldn't you check the results of something like this before pushing?
>> > Sorry for piling on, but that seems like a quite critical step.
>>
>> Actually, my takeaway from this was "don't ever use git reset on the repo".
>> "git revert" would have been much safer.  Yeah, it would have meant that
>> git blame on the 9.2 branch would have some useless noise, but how much
>> does anyone still care about that?
>
> FYI, my takeaway is that you can't run parallel 'git pull' operations on
> different branches checked out of the same tree, at least as setup from
> instructions on our wiki.   Such parallel operations generate messages
> indicating someone else is working on the tree, but I now realize those
> are _warnings_ and this behavior should be avoided.  Normally it works
> fine, but for a big commit, it can move a changeset from one branch to
> another, with disastrous consequences.
>
> Yes, I should have checked more, but I often do a pull before a push as
> another check, so that can mess it up too.  Basically, if your tools are
> being used improperly, checking can make things worse too.
>
> --
>   Bruce Momjian  http://momjian.us
>   EnterpriseDB http://enterprisedb.com
>
> + As you are, so once was I.  As I am, so you will be. +
> +  Ancient Roman grave inscription +
>
>
> --
> Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org)
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgsql-committers

Hi,

During reading source code, I noticed that updating copyright for 2017
has been missing in some files. Attached patch fixes it.

Regards,

--
Masahiko Sawada
NIPPON TELEGRAPH AND TELEPHONE CORPORATION
NTT Open Source Software Center


update_copyright.patch
Description: Binary data

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

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Bruce Momjian]

On Wed, Jan  4, 2017 at 10:05:10AM -0500, Tom Lane wrote:
> Andres Freund  writes:
> > On 2017-01-03 13:02:28 -0500, Bruce Momjian wrote:
> >> Yeah, I was doing parallel pulls of different branches in git via shell
> >> script, and it seems the size of this commit showed me that doesn't
> >> work.  Sorry.
> 
> > Shouldn't you check the results of something like this before pushing?
> > Sorry for piling on, but that seems like a quite critical step.
> 
> Actually, my takeaway from this was "don't ever use git reset on the repo".
> "git revert" would have been much safer.  Yeah, it would have meant that
> git blame on the 9.2 branch would have some useless noise, but how much
> does anyone still care about that?

FYI, my takeaway is that you can't run parallel 'git pull' operations on
different branches checked out of the same tree, at least as setup from
instructions on our wiki.   Such parallel operations generate messages
indicating someone else is working on the tree, but I now realize those
are _warnings_ and this behavior should be avoided.  Normally it works
fine, but for a big commit, it can move a changeset from one branch to
another, with disastrous consequences.

Yes, I should have checked more, but I often do a pull before a push as
another check, so that can mess it up too.  Basically, if your tools are
being used improperly, checking can make things worse too.

-- 
  Bruce Momjian  http://momjian.us
  EnterpriseDB http://enterprisedb.com

+ As you are, so once was I.  As I am, so you will be. +
+  Ancient Roman grave inscription +


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

Re: [COMMITTERS] pgsql: Update copyright for 2017

[David Fetter]

On Wed, Jan 04, 2017 at 11:54:07AM -0800, David Fetter wrote:
> On Wed, Jan 04, 2017 at 02:20:52PM -0500, Tom Lane wrote:
> > David Fetter  writes:
> > >>> Actually, my takeaway from this was "don't ever use git reset on
> > >>> the repo".
> > 
> > > That's actually not tenable.  If we ever find something in our
> > > repo that we don't have full rights to, especially if it's
> > > something that would put roadblocks in front of people who'd like
> > > to make a proprietary fork, we have to be able to expunge it, not
> > > merely paper it over.
> > 
> > What, and re-do every commit after the one that added such material?
> > And somehow find every tarball that was shipped with the material,
> > and make them go away?  Please don't bring straw-man arguments.
> 
> It might sound like a straw man if we hadn't already done this once.
> 
> > >> Except for like Andres says, always check *everything* before
> > >> pushing. I know I always push with -n and then do a git show on that
> > >> resulting set of commits just to make sure it's the one I want. It
> > >> doesn't take a lot of extra time after each commit, and it easily
> > >> finds things like this.
> > 
> > > Do we see a point in the future where all pushes to that repo
> > > require a reviewer separate from the author?  The cost in hassle
> > > and aggravation is, to put it mildly, non-trivial, but it makes
> > > these kinds of mistakes a lot harder to make.
> > 
> > No amount of review will prevent human error at the point of the
> > final push.
> 
> I suggest that it would.

ETOOLITTLECOFFEE

I do *not* suggest it would.

Best,
David.
-- 
David Fetter  http://fetter.org/
Phone: +1 415 235 3778  AIM: dfetter666  Yahoo!: dfetter
Skype: davidfetter  XMPP: david(dot)fetter(at)gmail(dot)com

Remember to vote!
Consider donating to Postgres: http://www.postgresql.org/about/donate


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

Re: [COMMITTERS] pgsql: Update copyright for 2017

[David Fetter]

On Wed, Jan 04, 2017 at 02:20:52PM -0500, Tom Lane wrote:
> David Fetter  writes:
> >>> Actually, my takeaway from this was "don't ever use git reset on
> >>> the repo".
> 
> > That's actually not tenable.  If we ever find something in our
> > repo that we don't have full rights to, especially if it's
> > something that would put roadblocks in front of people who'd like
> > to make a proprietary fork, we have to be able to expunge it, not
> > merely paper it over.
> 
> What, and re-do every commit after the one that added such material?
> And somehow find every tarball that was shipped with the material,
> and make them go away?  Please don't bring straw-man arguments.

It might sound like a straw man if we hadn't already done this once.

> >> Except for like Andres says, always check *everything* before
> >> pushing. I know I always push with -n and then do a git show on that
> >> resulting set of commits just to make sure it's the one I want. It
> >> doesn't take a lot of extra time after each commit, and it easily
> >> finds things like this.
> 
> > Do we see a point in the future where all pushes to that repo
> > require a reviewer separate from the author?  The cost in hassle
> > and aggravation is, to put it mildly, non-trivial, but it makes
> > these kinds of mistakes a lot harder to make.
> 
> No amount of review will prevent human error at the point of the
> final push.

I suggest that it would.

> Yeah, Bruce was probably unreasonably sloppy about this particular
> commit, but to imagine that we can get the error rate to exactly
> zero is hopeless.

I did not raise that hope.  What I did say was that we could, at a
cost, reduce the rate at which this happens.  It's far from clear to
me that the cost is worth paying at this point.

Best,
David.
-- 
David Fetter  http://fetter.org/
Phone: +1 415 235 3778  AIM: dfetter666  Yahoo!: dfetter
Skype: davidfetter  XMPP: david(dot)fetter(at)gmail(dot)com

Remember to vote!
Consider donating to Postgres: http://www.postgresql.org/about/donate


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

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Tom Lane]

David Fetter  writes:
>>> Actually, my takeaway from this was "don't ever use git reset on
>>> the repo".

> That's actually not tenable.  If we ever find something in our repo
> that we don't have full rights to, especially if it's something that
> would put roadblocks in front of people who'd like to make a
> proprietary fork, we have to be able to expunge it, not merely paper
> it over.

What, and re-do every commit after the one that added such material?
And somehow find every tarball that was shipped with the material, and
make them go away?  Please don't bring straw-man arguments.

>> Except for like Andres says, always check *everything* before
>> pushing. I know I always push with -n and then do a git show on that
>> resulting set of commits just to make sure it's the one I want. It
>> doesn't take a lot of extra time after each commit, and it easily
>> finds things like this.

> Do we see a point in the future where all pushes to that repo require
> a reviewer separate from the author?  The cost in hassle and
> aggravation is, to put it mildly, non-trivial, but it makes these
> kinds of mistakes a lot harder to make.

No amount of review will prevent human error at the point of the final
push.  Yeah, Bruce was probably unreasonably sloppy about this particular
commit, but to imagine that we can get the error rate to exactly zero
is hopeless.  That's what "git revert" is for.

regards, tom lane


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

Re: [COMMITTERS] pgsql: Update copyright for 2017

[David Fetter]

On Wed, Jan 04, 2017 at 04:08:20PM +0100, Magnus Hagander wrote:
> On Wed, Jan 4, 2017 at 4:05 PM, Tom Lane  wrote:
> > Andres Freund  writes:
> > > On 2017-01-03 13:02:28 -0500, Bruce Momjian wrote:
> > >> Yeah, I was doing parallel pulls of different branches in git
> > >> via shell script, and it seems the size of this commit showed
> > >> me that doesn't work.  Sorry.
> >
> > > Shouldn't you check the results of something like this before
> > > pushing?  Sorry for piling on, but that seems like a quite
> > > critical step.
> >
> > Actually, my takeaway from this was "don't ever use git reset on
> > the repo".

That's actually not tenable.  If we ever find something in our repo
that we don't have full rights to, especially if it's something that
would put roadblocks in front of people who'd like to make a
proprietary fork, we have to be able to expunge it, not merely paper
it over.

> > "git revert" would have been much safer.  Yeah, it would have meant that
> > git blame on the 9.2 branch would have some useless noise, but how much
> > does anyone still care about that?
> 
> Possibly this time, but the generic answer is a lot harder.

As above.

> Except for like Andres says, always check *everything* before
> pushing. I know I always push with -n and then do a git show on that
> resulting set of commits just to make sure it's the one I want. It
> doesn't take a lot of extra time after each commit, and it easily
> finds things like this.

Do we see a point in the future where all pushes to that repo require
a reviewer separate from the author?  The cost in hassle and
aggravation is, to put it mildly, non-trivial, but it makes these
kinds of mistakes a lot harder to make.

Best,
David.
-- 
David Fetter  http://fetter.org/
Phone: +1 415 235 3778  AIM: dfetter666  Yahoo!: dfetter
Skype: davidfetter  XMPP: david(dot)fetter(at)gmail(dot)com

Remember to vote!
Consider donating to Postgres: http://www.postgresql.org/about/donate


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

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Stephen Frost]

* Tom Lane (t...@sss.pgh.pa.us) wrote:
> Andres Freund  writes:
> > On 2017-01-03 13:02:28 -0500, Bruce Momjian wrote:
> >> Yeah, I was doing parallel pulls of different branches in git via shell
> >> script, and it seems the size of this commit showed me that doesn't
> >> work.  Sorry.
> 
> > Shouldn't you check the results of something like this before pushing?
> > Sorry for piling on, but that seems like a quite critical step.
> 
> Actually, my takeaway from this was "don't ever use git reset on the repo".
> "git revert" would have been much safer.  Yeah, it would have meant that
> git blame on the 9.2 branch would have some useless noise, but how much
> does anyone still care about that?

+1.

Thanks!

Stephen


signature.asc
Description: Digital signature

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Magnus Hagander]

On Wed, Jan 4, 2017 at 4:05 PM, Tom Lane  wrote:

> Andres Freund  writes:
> > On 2017-01-03 13:02:28 -0500, Bruce Momjian wrote:
> >> Yeah, I was doing parallel pulls of different branches in git via shell
> >> script, and it seems the size of this commit showed me that doesn't
> >> work.  Sorry.
>
> > Shouldn't you check the results of something like this before pushing?
> > Sorry for piling on, but that seems like a quite critical step.
>
> Actually, my takeaway from this was "don't ever use git reset on the repo".
> "git revert" would have been much safer.  Yeah, it would have meant that
> git blame on the 9.2 branch would have some useless noise, but how much
> does anyone still care about that?
>

Possibly this time, but the generic answer is a lot harder.

If you do a git reset, you pay the one-time cost. Once the (fairly few)
people who managed to pull in between have updated, the problem is gone.

If you do a git revert, the problem stays around forever (but it's a
smaller one).

In the end it's going to be case-by-case. We may have done it wrong this
time, but I don't think we can generally say what's right for the next one.

Except for like Andres says, always check *everything* before pushing. I
know I always push with -n and then do a git show on that resulting set of
commits just to make sure it's the one I want. It doesn't take a lot of
extra time after each commit, and it easily finds things like this.

-- 
 Magnus Hagander
 Me: http://www.hagander.net/
 Work: http://www.redpill-linpro.com/

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Tom Lane]

Andres Freund  writes:
> On 2017-01-03 13:02:28 -0500, Bruce Momjian wrote:
>> Yeah, I was doing parallel pulls of different branches in git via shell
>> script, and it seems the size of this commit showed me that doesn't
>> work.  Sorry.

> Shouldn't you check the results of something like this before pushing?
> Sorry for piling on, but that seems like a quite critical step.

Actually, my takeaway from this was "don't ever use git reset on the repo".
"git revert" would have been much safer.  Yeah, it would have meant that
git blame on the 9.2 branch would have some useless noise, but how much
does anyone still care about that?

regards, tom lane


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

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Andres Freund]

On 2017-01-03 13:02:28 -0500, Bruce Momjian wrote:
> Yeah, I was doing parallel pulls of different branches in git via shell
> script, and it seems the size of this commit showed me that doesn't
> work.  Sorry.

Shouldn't you check the results of something like this before pushing?
Sorry for piling on, but that seems like a quite critical step.

Andres


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

[COMMITTERS] pgsql: Update copyright for 2017

[Bruce Momjian]

Update copyright for 2017

Backpatch-through: certain files through 9.2

Branch
--
REL9_2_STABLE

Details
---
http://git.postgresql.org/pg/commitdiff/83a25a5209d93615e6d5f3eee4ef649853478498

Modified Files
--
COPYRIGHT   | 2 +-
doc/src/sgml/legal.sgml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)


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

Re: [HACKERS] [COMMITTERS] pgsql: Update copyright for 2017

[Tom Lane]

Magnus Hagander  writes:
> On Tue, Jan 3, 2017 at 6:59 PM, Heikki Linnakangas  wrote:
>> Ok. Now let's wait for the fallout from the reset. This is an interesting
>> experiment, we'll find out how many people are annoyed by a reset :-).

> Yeah, and how many had time to pull. It was only out there for 15 minutes
> or so.

I hadn't pulled it, so no problem from here.

> I bet a number of buildfarm machines will dislike it :(

We might be saved by the fact that Bruce pushed all the minor back-branch
updates first --- the buildfarm critters were still working through those,
or at least the ones using run_branches.pl were, when you pushed the
reset.

regards, tom lane


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

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Bruce Momjian]

On Tue, Jan  3, 2017 at 06:57:44PM +0100, Magnus Hagander wrote:
> 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.

Yeah, I was doing parallel pulls of different branches in git via shell
script, and it seems the size of this commit showed me that doesn't
work.  Sorry.

-- 
  Bruce Momjian  http://momjian.us
  EnterpriseDB http://enterprisedb.com

+ As you are, so once was I.  As I am, so you will be. +
+  Ancient Roman grave inscription +


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

Re: [HACKERS] [COMMITTERS] pgsql: Update copyright for 2017

[Magnus Hagander]

On Tue, Jan 3, 2017 at 6:59 PM, Jim Nasby  wrote:

> On 1/3/17 11:57 AM, Magnus Hagander wrote:
>
>> I've pushed a reset to the master repo. Working on the mirror now.
>>
>
> Please don't forget github. :)
>
> Handled, thanks for the reminder.


-- 
 Magnus Hagander
 Me: http://www.hagander.net/
 Work: http://www.redpill-linpro.com/

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Magnus Hagander]

On Tue, Jan 3, 2017 at 6:59 PM, Heikki Linnakangas  wrote:

> On 01/03/2017 07:57 PM, Magnus Hagander wrote:
>
>> On Tue, Jan 3, 2017 at 6:54 PM, Heikki Linnakangas 
>> 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.
>>
>
> Ok. Now let's wait for the fallout from the reset. This is an interesting
> experiment, we'll find out how many people are annoyed by a reset :-).


Yeah, and how many had time to pull. It was only out there for 15 minutes
or so.

I bet a number of buildfarm machines will dislike it :(

-- 
 Magnus Hagander
 Me: http://www.hagander.net/
 Work: http://www.redpill-linpro.com/

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Heikki Linnakangas]

On 01/03/2017 07:57 PM, Magnus Hagander wrote:

On Tue, Jan 3, 2017 at 6:54 PM, Heikki Linnakangas  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.


Ok. Now let's wait for the fallout from the reset. This is an 
interesting experiment, we'll find out how many people are annoyed by a 
reset :-).


- Heikki



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

Re: [HACKERS] [COMMITTERS] pgsql: Update copyright for 2017

[Jim Nasby]

On 1/3/17 11:57 AM, Magnus Hagander wrote:

I've pushed a reset to the master repo. Working on the mirror now.


Please don't forget github. :)
--
Jim Nasby, Data Architect, Blue Treble Consulting, Austin TX
Experts in Analytics, Data Architecture and PostgreSQL
Data in Trouble? Get it in Treble! http://BlueTreble.com
855-TREBLE2 (855-873-2532)


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

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Magnus Hagander]

On Tue, Jan 3, 2017 at 6:54 PM, Heikki Linnakangas  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/

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Heikki Linnakangas]

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.


- Heikki



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

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Bruce Momjian]

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.

---


> 
> //Magnus
> 
> 
> On Tue, Jan 3, 2017 at 6:41 PM, Bruce Momjian  wrote:
> 
> 
> Sorry, this will be reverted and redone.
> 
> 
> ---
> 
> On Tue, Jan  3, 2017 at 05:38:05PM +, Bruce Momjian wrote:
> > Update copyright for 2017
> >
> > Backpatch-through: certain files through 9.2
> >
> > Branch
> > --
> > REL9_2_STABLE
> >
> > Details
> > ---
> > http://git.postgresql.org/pg/commitdiff/19371e148207c33d15fded06a178d5
> 8d0781141d
> >
> > Modified Files
> > --
> > COPYRIGHT                                          |    2 +-
> > configure                                          |   11 +
> > configure.in                                       |    4 +
> > contrib/adminpack/adminpack.c                      |    4 +
> > contrib/auth_delay/auth_delay.c                    |    4 +
> > contrib/auto_explain/auto_explain.c                |    4 +
> > contrib/bloom/blcost.c                             |   48 +
> > contrib/bloom/blinsert.c                           |  358 ++
> > contrib/bloom/bloom.h                              |  212 +
> > contrib/bloom/blscan.c                             |  173 +
> > contrib/bloom/blutils.c                            |  485 ++
> > contrib/bloom/blvacuum.c                           |  217 +
> > contrib/bloom/blvalidate.c                         |  220 +
> > contrib/dblink/dblink.c                            |    4 +
> > contrib/dblink/dblink.h                            |    4 +
> > contrib/dict_int/dict_int.c                        |    4 +
> > contrib/dict_xsyn/dict_xsyn.c                      |    4 +
> > contrib/dummy_seclabel/dummy_seclabel.c            |    4 +
> > contrib/file_fdw/file_fdw.c                        |    4 +
> > contrib/fuzzystrmatch/fuzzystrmatch.c              |    4 +
> > contrib/fuzzystrmatch/levenshtein.c                |    4 +
> > contrib/intarray/_int_selfuncs.c                   |  341 ++
> > contrib/isn/isn.c                                  |    4 +
> > contrib/isn/isn.h                                  |    4 +
> > contrib/pageinspect/brinfuncs.c                    |  409 ++
> > contrib/pageinspect/fsmfuncs.c                     |    4 +
> > contrib/pageinspect/ginfuncs.c                     |  283 ++
> > contrib/pageinspect/heapfuncs.c                    |    4 +
> > contrib/pageinspect/rawpage.c                      |    4 +
> > contrib/passwordcheck/passwordcheck.c              |    4 +
> > contrib/pg_prewarm/pg_prewarm.c                    |  206 +
> > contrib/pg_stat_statements/pg_stat_statements.c    |    4 +
> > contrib/pg_trgm/trgm_regexp.c                      | 2244 +
> > contrib/pg_upgrade/check.c                         |    5 +
> > contrib/pg_upgrade/controldata.c                   |    5 +
> > contrib/pg_upgrade/exec.c                          |    5 +
> > contrib/pg_upgrade/option.c                        |    5 +
> > contrib/pg_upgrade/pg_upgrade.h                    |    5 +
> > contrib/pg_upgrade/server.c                        |    5 +
> > contrib/pg_upgrade/test.sh                         |    4 +
> > contrib/pg_visibility/pg_visibility.c              |  749 +++
> > contrib/pgstattuple/pgstatapprox.c                 |  303 ++
> > contrib/postgres_fdw/connection.c                  |  838 
> > contrib/postgres_fdw/deparse.c                     | 2940 
> > contrib/postgres_fdw/option.c                      |  363 ++
> > contrib/postgres_fdw/postgres_fdw.c                | 5029
> 
> > contrib/postgres_fdw/postgres_fdw.h                |  172 +
> > contrib/postgres_fdw/shippable.c                   |  214 +
> > contrib/sepgsql/database.c                         |    4 +
> > contrib/sepgsql/dml.c                              |    4 +
> > contrib/sepgsql/hooks.c                            |    4 +
> > contrib/sepgsql/label.c                            |    4 +
> > contrib/sepgsql/launcher                           |    4 +
> > contrib/sepgsql/proc.c                             |    4 +
> > contrib/sepgsql/relation.c    

[COMMITTERS] pgsql: Update copyright for 2017

[Bruce Momjian]

Update copyright for 2017

Backpatch-through: certain files through 9.2

Branch
--
master

Details
---
http://git.postgresql.org/pg/commitdiff/7090eed3b3e476d6ac20ba8e5f6e3914f18f9632

Modified Files
--
COPYRIGHT   | 2 +-
doc/src/sgml/legal.sgml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)


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

Re: [COMMITTERS] pgsql: Update copyright for 2017

[Bruce Momjian]

Sorry, this will be reverted and redone.

---

On Tue, Jan  3, 2017 at 05:38:05PM +, Bruce Momjian wrote:
> Update copyright for 2017
> 
> Backpatch-through: certain files through 9.2
> 
> Branch
> --
> REL9_2_STABLE
> 
> Details
> ---
> http://git.postgresql.org/pg/commitdiff/19371e148207c33d15fded06a178d58d0781141d
> 
> Modified Files
> --
> COPYRIGHT  |2 +-
> configure  |   11 +
> configure.in   |4 +
> contrib/adminpack/adminpack.c  |4 +
> contrib/auth_delay/auth_delay.c|4 +
> contrib/auto_explain/auto_explain.c|4 +
> contrib/bloom/blcost.c |   48 +
> contrib/bloom/blinsert.c   |  358 ++
> contrib/bloom/bloom.h  |  212 +
> contrib/bloom/blscan.c |  173 +
> contrib/bloom/blutils.c|  485 ++
> contrib/bloom/blvacuum.c   |  217 +
> contrib/bloom/blvalidate.c |  220 +
> contrib/dblink/dblink.c|4 +
> contrib/dblink/dblink.h|4 +
> contrib/dict_int/dict_int.c|4 +
> contrib/dict_xsyn/dict_xsyn.c  |4 +
> contrib/dummy_seclabel/dummy_seclabel.c|4 +
> contrib/file_fdw/file_fdw.c|4 +
> contrib/fuzzystrmatch/fuzzystrmatch.c  |4 +
> contrib/fuzzystrmatch/levenshtein.c|4 +
> contrib/intarray/_int_selfuncs.c   |  341 ++
> contrib/isn/isn.c  |4 +
> contrib/isn/isn.h  |4 +
> contrib/pageinspect/brinfuncs.c|  409 ++
> contrib/pageinspect/fsmfuncs.c |4 +
> contrib/pageinspect/ginfuncs.c |  283 ++
> contrib/pageinspect/heapfuncs.c|4 +
> contrib/pageinspect/rawpage.c  |4 +
> contrib/passwordcheck/passwordcheck.c  |4 +
> contrib/pg_prewarm/pg_prewarm.c|  206 +
> contrib/pg_stat_statements/pg_stat_statements.c|4 +
> contrib/pg_trgm/trgm_regexp.c  | 2244 +
> contrib/pg_upgrade/check.c |5 +
> contrib/pg_upgrade/controldata.c   |5 +
> contrib/pg_upgrade/exec.c  |5 +
> contrib/pg_upgrade/option.c|5 +
> contrib/pg_upgrade/pg_upgrade.h|5 +
> contrib/pg_upgrade/server.c|5 +
> contrib/pg_upgrade/test.sh |4 +
> contrib/pg_visibility/pg_visibility.c  |  749 +++
> contrib/pgstattuple/pgstatapprox.c |  303 ++
> contrib/postgres_fdw/connection.c  |  838 
> contrib/postgres_fdw/deparse.c | 2940 
> contrib/postgres_fdw/option.c  |  363 ++
> contrib/postgres_fdw/postgres_fdw.c| 5029 
> contrib/postgres_fdw/postgres_fdw.h|  172 +
> contrib/postgres_fdw/shippable.c   |  214 +
> contrib/sepgsql/database.c |4 +
> contrib/sepgsql/dml.c  |4 +
> contrib/sepgsql/hooks.c|4 +
> contrib/sepgsql/label.c|4 +
> contrib/sepgsql/launcher   |4 +
> contrib/sepgsql/proc.c |4 +
> contrib/sepgsql/relation.c |4 +
> contrib/sepgsql/schema.c   |4 +
> contrib/sepgsql/selinux.c  |4 +
> contrib/sepgsql/sepgsql.h  |4 +
> contrib/sepgsql/uavc.c |4 +
> contrib/tablefunc/tablefunc.c  |4 +
> contrib/tablefunc/tablefunc.h  |4 +
> contrib/tcn/tcn.c  |4 +
> contrib/test_decoding/test_decoding.c  |  489 ++
> contrib/test_parser/test_parser.c  |4 +
> contrib/tsearch2/tsearch2.c|4 +
> contrib/tsm_system_rows/tsm_system_rows.c  |  394 ++
> contrib/tsm_system_time/tsm_system_time.c  |  358 ++
> contrib/unaccent/unaccent.c|4 +
> contrib/uuid-ossp/uuid-ossp.c  |6 +
> contrib/vacuumlo/vacuumlo.c|4 +
> doc/src/sgml/generate-errcodes-table.pl|4 +
> doc/src/sgml/legal.sgml|9 +-
> doc/src/sgml/lobj.sgml   

[COMMITTERS] pgsql: Update copyright for 2017

[Bruce Momjian]

Update copyright for 2017

Backpatch-through: certain files through 9.2

Branch
--
REL9_2_STABLE

Details
---
http://git.postgresql.org/pg/commitdiff/19371e148207c33d15fded06a178d58d0781141d

Modified Files
--
COPYRIGHT  |2 +-
configure  |   11 +
configure.in   |4 +
contrib/adminpack/adminpack.c  |4 +
contrib/auth_delay/auth_delay.c|4 +
contrib/auto_explain/auto_explain.c|4 +
contrib/bloom/blcost.c |   48 +
contrib/bloom/blinsert.c   |  358 ++
contrib/bloom/bloom.h  |  212 +
contrib/bloom/blscan.c |  173 +
contrib/bloom/blutils.c|  485 ++
contrib/bloom/blvacuum.c   |  217 +
contrib/bloom/blvalidate.c |  220 +
contrib/dblink/dblink.c|4 +
contrib/dblink/dblink.h|4 +
contrib/dict_int/dict_int.c|4 +
contrib/dict_xsyn/dict_xsyn.c  |4 +
contrib/dummy_seclabel/dummy_seclabel.c|4 +
contrib/file_fdw/file_fdw.c|4 +
contrib/fuzzystrmatch/fuzzystrmatch.c  |4 +
contrib/fuzzystrmatch/levenshtein.c|4 +
contrib/intarray/_int_selfuncs.c   |  341 ++
contrib/isn/isn.c  |4 +
contrib/isn/isn.h  |4 +
contrib/pageinspect/brinfuncs.c|  409 ++
contrib/pageinspect/fsmfuncs.c |4 +
contrib/pageinspect/ginfuncs.c |  283 ++
contrib/pageinspect/heapfuncs.c|4 +
contrib/pageinspect/rawpage.c  |4 +
contrib/passwordcheck/passwordcheck.c  |4 +
contrib/pg_prewarm/pg_prewarm.c|  206 +
contrib/pg_stat_statements/pg_stat_statements.c|4 +
contrib/pg_trgm/trgm_regexp.c  | 2244 +
contrib/pg_upgrade/check.c |5 +
contrib/pg_upgrade/controldata.c   |5 +
contrib/pg_upgrade/exec.c  |5 +
contrib/pg_upgrade/option.c|5 +
contrib/pg_upgrade/pg_upgrade.h|5 +
contrib/pg_upgrade/server.c|5 +
contrib/pg_upgrade/test.sh |4 +
contrib/pg_visibility/pg_visibility.c  |  749 +++
contrib/pgstattuple/pgstatapprox.c |  303 ++
contrib/postgres_fdw/connection.c  |  838 
contrib/postgres_fdw/deparse.c | 2940 
contrib/postgres_fdw/option.c  |  363 ++
contrib/postgres_fdw/postgres_fdw.c| 5029 
contrib/postgres_fdw/postgres_fdw.h|  172 +
contrib/postgres_fdw/shippable.c   |  214 +
contrib/sepgsql/database.c |4 +
contrib/sepgsql/dml.c  |4 +
contrib/sepgsql/hooks.c|4 +
contrib/sepgsql/label.c|4 +
contrib/sepgsql/launcher   |4 +
contrib/sepgsql/proc.c |4 +
contrib/sepgsql/relation.c |4 +
contrib/sepgsql/schema.c   |4 +
contrib/sepgsql/selinux.c  |4 +
contrib/sepgsql/sepgsql.h  |4 +
contrib/sepgsql/uavc.c |4 +
contrib/tablefunc/tablefunc.c  |4 +
contrib/tablefunc/tablefunc.h  |4 +
contrib/tcn/tcn.c  |4 +
contrib/test_decoding/test_decoding.c  |  489 ++
contrib/test_parser/test_parser.c  |4 +
contrib/tsearch2/tsearch2.c|4 +
contrib/tsm_system_rows/tsm_system_rows.c  |  394 ++
contrib/tsm_system_time/tsm_system_time.c  |  358 ++
contrib/unaccent/unaccent.c|4 +
contrib/uuid-ossp/uuid-ossp.c  |6 +
contrib/vacuumlo/vacuumlo.c|4 +
doc/src/sgml/generate-errcodes-table.pl|4 +
doc/src/sgml/legal.sgml|9 +-
doc/src/sgml/lobj.sgml |9 +
src/backend/Makefile   |4 +
src/backend/access/brin/brin.c | 1227 +
src/backend/access/brin/brin_inclusion.c   |  702 +++
src/backend/access/brin/brin_minmax.c  |  374 ++
src/backend/access/brin/brin_pageops.c |  893 

[COMMITTERS] pgsql: Update copyright for 2017

[Bruce Momjian]

Update copyright for 2017

Backpatch-through: certain files through 9.2

Branch
--
REL9_6_STABLE

Details
---
http://git.postgresql.org/pg/commitdiff/344ae600ac036675d52afca9e8b363628d78d36d

Modified Files
--
COPYRIGHT   | 2 +-
doc/src/sgml/legal.sgml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)


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

[COMMITTERS] pgsql: Update copyright for 2017

[Bruce Momjian]

Update copyright for 2017

Backpatch-through: certain files through 9.2

Branch
--
REL9_4_STABLE

Details
---
http://git.postgresql.org/pg/commitdiff/1dfe7f068121d15d59c85ecd936d154922e195d1

Modified Files
--
COPYRIGHT   | 2 +-
doc/src/sgml/legal.sgml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)


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

[COMMITTERS] pgsql: Update copyright for 2017

[Bruce Momjian]

Update copyright for 2017

Backpatch-through: certain files through 9.2

Branch
--
REL9_3_STABLE

Details
---
http://git.postgresql.org/pg/commitdiff/e7c586e7b222b80c42de473468ce5e7e14bbca60

Modified Files
--
COPYRIGHT   | 2 +-
doc/src/sgml/legal.sgml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)


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

[COMMITTERS] pgsql: Update copyright for 2017

[Bruce Momjian]

Update copyright for 2017

Backpatch-through: certain files through 9.2

Branch
--
REL9_5_STABLE

Details
---
http://git.postgresql.org/pg/commitdiff/92ade06b2cf3985a93f45edd10d4855dcc0bf26d

Modified Files
--
COPYRIGHT   | 2 +-
doc/src/sgml/legal.sgml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)


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