Re: Doc: CG: add instructions for staging branch (issue 5440080)

[Phil Holmes]

----- Original Message ----- 
From: "Graham Percival" <address@hidden>
To: "Carl Sorensen" <address@hidden>
Cc: "Keith OHara" <address@hidden>; 
<address@hidden>; <address@hidden>; 
<address@hidden>
Sent: Saturday, December 03, 2011 6:27 AM
Subject: Re: Doc: CG: add instructions for staging branch (issue 5440080)


> On Sat, Dec 03, 2011 at 04:05:45AM +0000, Carl Sorensen wrote:
> > On 12/2/11 9:01 PM, "address@hidden" <address@hidden>
> > wrote:
> > >However, perhaps we need to explain this (and modify lily-git.tcl).
> > >I'll take a look at lily-git.tcl and see how hard it would be to modify
> > >it.
> >
> > We can make lily-git.tcl aware of master and staging.  We could even add 
> > a
> > separate branch on which the patches would be worked.
> >
> > I'll see if I can work something up.
>
> Thanks, that would be great.
>
> I wonder if we can/should assume that no developer (i.e. person
> with push ability) is using lily-git.tcl.  If we make that
> assumption, then lily-git.tcl would only need to track master (to
> keep the source up-to-date) and "working" (the branch that all
> that contributor's work is done on -- maybe even call it
> dev/USERNAME ?).  I'd like to have contributor's work being done
> on a separate branch, even though it'll be strictly local, just to
> get them used to the idea of branches.  If "master" is always seen
> as a mirror of origin/master, that removes one layer of possible
> confusion.

FWIW I use a combination of lily-git and git command line.  I like the 
convenience of being able to update master, create commits and patches and 
abandon work without all the "oh my god, am I doing this right" with git. 
My (simple) workflow is that I use lily-git to pull, make my changes, use 
lily-git to commit and create a patch, then I usually abort my changes.  I 
then use command line to fetch staging, apply my patch and push to staging, 
using David's instructions on how to do this.  We might consider that kind 
of work flow in the CG, for people like me who aren't experienced with git. 
It would also need the comment that if you know what you're doing, you 
needn't follow this, but don't mess up.

--
Phil Holmes