On moving to git...

2011-04-17 Thread Thomas Adam
Hi all, I said I would try and outline where I think we should be in terms of moving to git. I have to say that I am surprised at just how sudden such a switch has taken place; in the past I had asked Jason and Dominik off-list what would be involved, and whether it was a good idea. Reaction fro

Re: On moving to git...

2011-04-17 Thread Thomas Adam
On Sun, Apr 17, 2011 at 01:29:27PM +0100, Thomas Adam wrote: > Hi all, > > I said I would try and outline where I think we should be in terms of moving > to git. I have to say that I am surprised at just how sudden such a switch > has taken place; in the past I had asked Jason and Dominik off-lis

Re: On moving to git...

2011-04-17 Thread Dominik Vogt
On Sun, Apr 17, 2011 at 03:03:23PM +0100, Thomas Adam wrote: > I forgot to mention the ChangeLog. > > ChangeLog > = ... > So in this way, it's still possible to generate a ChangeLog *after* the > fact. Actually, with real changeset based development, the ChangeLog is obsolete. A well m

Re: On moving to git...

2011-04-17 Thread Thomas Adam
On Sun, Apr 17, 2011 at 06:40:37PM +0200, Dominik Vogt wrote: > On Sun, Apr 17, 2011 at 03:03:23PM +0100, Thomas Adam wrote: > > I forgot to mention the ChangeLog. > > > > ChangeLog > > = > > ... > > > So in this way, it's still possible to generate a ChangeLog *after* the > > fact. > >

Re: On moving to git...

2011-04-17 Thread Dominik Vogt
Phew, so much text. :-) On Sun, Apr 17, 2011 at 01:29:27PM +0100, Thomas Adam wrote: > Workflow Ideas > == I've had very good experiences with this setup: * There is a central fvwm release repository somewhere, maybe on fvwm.org. * The release repo has the branches release and de

Re: On moving to git...

2011-04-17 Thread Dominik Vogt
On Sun, Apr 17, 2011 at 05:45:51PM +0100, Thomas Adam wrote: > On Sun, Apr 17, 2011 at 06:40:37PM +0200, Dominik Vogt wrote: > You and I have both got patches in tig, ISTR. :) Yes, I remember that. :-) Ciao Dominik ^_^ ^_^ -- Dominik Vogt

Re: On moving to git...

2011-04-17 Thread Dominik Vogt
On Sun, Apr 17, 2011 at 07:09:15PM +0200, Dominik Vogt wrote: > 1. Make sure that the release branch is an ancestor of the >devel branch. > 2. Check out the devel branch and set a temporary tag. > $ git checkout devel > $ git tag foo > 3. Check out the release br

Re: On moving to git...

2011-04-17 Thread Thomas Adam
On Sun, Apr 17, 2011 at 07:09:15PM +0200, Dominik Vogt wrote: > Phew, so much text. :-) Sorry about that -- I did warn it was lengthy. > On Sun, Apr 17, 2011 at 01:29:27PM +0100, Thomas Adam wrote: > > Workflow Ideas > > == > > I've had very good experiences with this setup: > > *

Re: On moving to git...

2011-04-17 Thread Dominik Vogt
On Sun, Apr 17, 2011 at 06:24:37PM +0100, Thomas Adam wrote: > On Sun, Apr 17, 2011 at 07:09:15PM +0200, Dominik Vogt wrote: > > * The topic branches should usually belong to only one developer. > > The owner of a topic branch is responsible for keeping it in > > sync with the devel or release

Re: On moving to git...

2011-04-17 Thread Thomas Adam
On Sun, Apr 17, 2011 at 10:01:55PM +0200, Dominik Vogt wrote: > On Sun, Apr 17, 2011 at 06:24:37PM +0100, Thomas Adam wrote: > > On Sun, Apr 17, 2011 at 07:09:15PM +0200, Dominik Vogt wrote: > > > * The topic branches should usually belong to only one developer. > > > The owner of a topic branch

Re: On moving to git...

2011-04-23 Thread Thomas Adam
On Sun, Apr 17, 2011 at 10:40:02PM +0100, Thomas Adam wrote: [...] > This needs writing up, I suppose I'll do that? Just to let people know, we're working on this. -- Thomas Adam -- "Deep in my heart I wish I was wrong. But deep in my heart I know I am not." -- Morrissey ("Girl Least Likely