Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-04-18 Thread 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 seem

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-06 Thread 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.

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-04 Thread 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 so

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-04 Thread 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 i

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-04 Thread 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 lik

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-04 Thread 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 i

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-04 Thread 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. > > > Shou

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-04 Thread 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.

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-04 Thread 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 be

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-04 Thread 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

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-03 Thread 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 h

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-03 Thread 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:

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-03 Thread 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

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-03 Thread 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

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-03 Thread 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

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-03 Thread 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 wor

Re: [COMMITTERS] pgsql: Update copyright for 2017

2017-01-03 Thread 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 >