From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Mon, 23 Jul 2007 10:59:26 GMT
Subject: Re: What is a reasonable mixed workflow for git/git-cvsserver?
Message-ID: <46a038f90707230359u5fac77a4i7b6a350d3bb29e3b@mail.gmail.com>
In-Reply-To: <E8B0B250-A428-4CDC-A4D2-FFCF45953076@zib.de>

On 7/23/07, Steffen Prohaska <prohaska@zib.de> wrote:
> What's a reasonable workflow when some people use git and
> other people use git-cvsserver simultaneously?

It was written on the concept that the core developers would switch to
git and occassional committers and less sophisticated SCM users like
translators would be able to continue using cvs.

Basically, cvs users can no longer tag or open new branches. So your
plan is exactly what we set out to support. Switching branches is not
possibe -- that's unfortunate, but emulating CVS's branching is a
bridge too far :-)

> What is a reasonable way to handle the unsorted commits
> from a shared branch in a more git-ish way? I googled a bit
> but didn't find a good explanation on the web.

I am not sure what you mean by unsorted commits... "proposed patches"?
The git project itself has a proposed-updates branch that might serve
as an example. And repo.or.cz has the strange concept of the mob
branch that you might want to have a look at.

cheers,


martin