git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Jul 23, 2007, 14:19 UTC
Message-ID
<46a038f90707230719i106e0576j2868548ef0cb1739@mail.gmail.com>
In-Reply-To
<AD8AD244-0B20-44E9-AEE6-9D2A75BC5091@zib.de>
On 7/23/07, Steffen Prohaska <prohaska@zib.de> wrote:
Show 6 quoted lines
> 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.

Keep the good commit message practices ;-) in my projects I tend to mimic the linux and git "style" for commit msgs.

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

I think that's usually frowned upon. As the committer did his/her work on a particular state of the tree, and tested it. So every commit at least *should* be of a working state. Once you rewrite history as a "normal" practice, that flies out of the window. And it's a big loss.

In a sense, it's a "history that looks tidy but is false". And it's extra work too. I very strongly prefer good commit messages, and the real history.

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

Indeed not. Junio rewinds/rebases pu (the proposed updates branch mentioned earlier) regularly, but you can only do that in a pure-git project, and with fairly experienced git users (so if they get caught with commits on top of a rewound pu branch they'll know what to do). cvsserver doesn't know what to do with rewinds/rebases and, more importantly, cvs clients can't cope with it. And that is something we cannot fix, unfortunately.

cheers,
martin
>         Steffen
>
>
Previous: Steffen ProhaskaNext: Brian Gernhardt
Message 5 of 6 in “What is a reasonable mixed workflow for git/git-cvsserver?”
  1. Steffen ProhaskaJul 23, 2007
  2. Johannes SchindelinJul 23, 2007
  3. Martin LanghoffJul 23, 2007
  4. Steffen ProhaskaJul 23, 2007
  5. Martin LanghoffJul 23, 2007
  6. Brian GernhardtJul 23, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.