Re: pushing patches to an imap folder

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 15, 2005, 11:36 UTC
Message-ID: <Pine.LNX.4.63.0511151227300.21902@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <4379B9F6.5020402@codeweavers.com>

Hi,

On Tue, 15 Nov 2005, Mike McCormack wrote:

Show 10 quoted lines

> Junio C Hamano wrote:
> 
> > Hmph.  How well does the rest of git help your workflow, working with 
> > the Wine community?  Especially, how are you keeping track of and 
> > interoperating with their main CVS repository?
> 
> We have a (semi-experimental) wine.git tree, which is updated at the 
> same time as the Wine CVS, by the project maintainer:
> 
> http://source.winehq.org/git/wine.git

This is cool! I used to track wine with "git-cvsimport -i".

My work flow was like this (not with wine, since I did not have enough time to hack on it in the last months, but with other CVS managed projects):

"git-cvsimport -i" every once in a while, followed by "git pull . origin" (my working branch is always master).

When I have something interesting, I make a topic branch from origin ("git checkout -b eyes_apple origin"), and pick the interesting commits from master ("git cherry-pick SHA1").

Sometimes I pick multiple commits with the "-n" flag, so that I can hide my shortcomings, committing with the message of the first commit ("git commit -C SHA1").

Then, I use git-format-patch to generate the patches, which I hand-edit to make sure there is no typo, and no unwanted changes slipped in. Then, I send the message(s).

> It will probably be maintained in parallel with the Wine CVS for a while,
> unless somebody writes a GIT->CVS gateway.

It would be cool to have something like git-cvs-daemon, which simulates a CVS server.

Ciao, Dscho