Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-21 Thread Alan W. Irwin
On 2014-08-21 06:20-0400 Hazen Babcock wrote: >> >> @Everybody: >> Instead of writing a rebase workflow document myself that we could >> use, I have been looking for something like that written by someone >> else. What do you think of adopting (the quite restrictive) rebase >> workflow outlined in

Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-21 Thread Hazen Babcock
> > @Everybody: > Instead of writing a rebase workflow document myself that we could > use, I have been looking for something like that written by someone > else. What do you think of adopting (the quite restrictive) rebase > workflow outlined in >

Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-20 Thread Hazen Babcock
Correcting the subject line.. On 8/20/2014 11:29 AM, Hazen Babcock wrote: > On 8/20/2014 5:51 AM, plplot-devel-requ...@lists.sourceforge.net wrote: >> Date: Tue, 19 Aug 2014 12:24:54 -0700 (PDT) >> From: "Alan W. Irwin" > > .. > >> In sum, I think rebase-only is not only back on the table for ou

Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-19 Thread Alan W. Irwin
Below is another extremely useful e-mail from Brad King that I would like to preserve on the plplot-devel list because it includes the detailed update hook logic needed for enforcement of a good history shape for a merge workflow and other useful comments. If we decide to start with a merge workf

Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-19 Thread Alan W. Irwin
I have a lot of respect for Brad King (the git guru for the CMake software project, and the moving force behind CMake development). Here is part of what he had to say in response to an e-mail I sent him. On 2014-08-18 09:20-0400 Brad King wrote: > The server side hooks of course go on the server

Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-17 Thread Alan W. Irwin
On 2014-08-17 06:29-0700 phil rosenberg wrote: Hi Alan I'm not great with shell scripts - I use them so infrequently I never remember the syntax. However I have quickly tried to modify the hook fromhttps://gist.github.com/caniszczyk/1327469. Basically you are trying to do something like: git

Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-17 Thread Alan W. Irwin
On 2014-08-16 22:55-0400 Hazen Babcock wrote: > On 8/16/2014 1:50 PM, Alan W. Irwin wrote: >> On 2014-08-16 06:50-0400 Hezekiah M. Carty wrote: >> >>> I agree with Hazen here - adding hooks on day one seems overkill for >>> the project. [...] >>> Given that the project and developers are overall

Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-17 Thread phil rosenberg
Sorry, replied rather than replied to all with this - Alan please see below From: phil rosenberg To: Hazen Babcock Sent: Sunday, 17 August 2014, 13:44 Subject: Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced Hi Alan I&#

Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-16 Thread Hazen Babcock
On 8/16/2014 1:50 PM, Alan W. Irwin wrote: > On 2014-08-16 06:50-0400 Hezekiah M. Carty wrote: > >> I agree with Hazen here - adding hooks on day one seems overkill for >> the project. [...] >> Given that the project and developers are overall new to git I think >> it would be premature to start s

Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-16 Thread Alan W. Irwin
On 2014-08-16 06:50-0400 Hezekiah M. Carty wrote: > I agree with Hazen here - adding hooks on day one seems overkill for > the project. [...] > Given that the project and developers are overall new to git I think > it would be premature to start stacking automated restrictions on top > of our use

Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-16 Thread Hezekiah M. Carty
On Fri, Aug 15, 2014 at 8:45 PM, Hazen Babcock wrote: > On 8/15/2014 2:53 PM, Alan W. Irwin wrote: >> Hi Hazen: >> >> Earlier today I sent an e-mail to Brad King, the CMake git guru (with >> CC to you to keep you fully informed) asking how they implemented the >> enforcement hooks in their git rep

Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-16 Thread Alan W. Irwin
On 2014-08-15 20:45-0400 Hazen Babcock wrote: > On 8/15/2014 2:53 PM, Alan W. Irwin wrote: >> Hi Hazen: >> >> Earlier today I sent an e-mail to Brad King, the CMake git guru (with >> CC to you to keep you fully informed) asking how they implemented the >> enforcement hooks in their git repo to ma

Re: [Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-15 Thread Hazen Babcock
On 8/15/2014 2:53 PM, Alan W. Irwin wrote: > Hi Hazen: > > Earlier today I sent an e-mail to Brad King, the CMake git guru (with > CC to you to keep you fully informed) asking how they implemented the > enforcement hooks in their git repo to maintain the desired > --first-parent properties of the i

[Plplot-devel] Trying to understand how git workflow for CMake is enforced

2014-08-15 Thread Alan W. Irwin
Hi Hazen: Earlier today I sent an e-mail to Brad King, the CMake git guru (with CC to you to keep you fully informed) asking how they implemented the enforcement hooks in their git repo to maintain the desired --first-parent properties of the integration branches used in their workflow. Assuming