Re: What is a reasonable mixed workflow for git/git-cvsserver?

From: Steffen Prohaska <prohaska@zib.de>
Date: Jul 23, 2007, 11:34 UTC
Message-ID: <AD8AD244-0B20-44E9-AEE6-9D2A75BC5091@zib.de>
In-Reply-To: <46a038f90707230359u5fac77a4i7b6a350d3bb29e3b@mail.gmail.com>

On Jul 23, 2007, at 12:59 PM, Martin Langhoff wrote:

Show 8 quoted lines

>> 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.

The mob branch seems to be related, although I do not plan for an anonymous mob but only for the cvs mob ...

If several people commit to the same shared branch exported by git-cvsserver they most likely will generate a series of unsorted commits, as they did in the past on a single cvs branch. The commits will probably deal with various topics, include bug fixes, and some are likely more experimental and not really ready for a stable branch.

My question is how to deal with this shared branch on the git side. Should a core developer rebuild a sane history from such a shared/mixed/unsorted branch by cherry picking the commits to one or more topic branches? If one did so, how could one bring the git-ish history back to the people connected by cvs? Am I allowed to reset branches exported by git-cvsserver? Probably not?

	Steffen