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

Re: [PATCH] cvstrack: work on imported cvs and other git branches

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jul 1, 2007, 16:11 UTC
Message-ID
<Pine.LNX.4.64.0707011710480.4438@racer.site>
In-Reply-To
<4880FDC4-BAD5-49B4-871B-98259D691449@zib.de>
Hi,
On Sun, 1 Jul 2007, Steffen Prohaska wrote:
Show 19 quoted lines
> On Jul 1, 2007, at 4:35 PM, Johannes Schindelin wrote:
> 
> > On Sun, 1 Jul 2007, Steffen Prohaska wrote:
> > 
> > > The idea is to import a cvs repository using git cvsimport; build a 
> > > perfect history in git by cherry picking commits that are only in 
> > > cvs but not in git; and export only summaries back to cvs. Cvs 
> > > imports are organized on a separate git branch. git is used for 
> > > merging. The differences can be sent back to cvs as a squashed 
> > > commit together with a shortlog. Sent git commits are noted in the 
> > > cvs commit message and will be ignored in subsequent cvs imports.
> > 
> > Wouldn't it be more intuitive to add a --squash option to 
> > git-cvsexportcommit?
> 
> Maybe.
> 
> But how to handle commits that are sent to cvs and come back
> through git-cvsimport?

Probably I do not really understand what you are doing... If the commits come from cvs, then they are already there, no? So where do you want to commit the squashed commits?

Ciao, Dscho

Previous: Steffen ProhaskaNext: Steffen Prohaska
Message 4 of 7 in “cvstrack: work on imported cvs and other git branches”
  1. cvstrack: work on imported cvs and other git branchesSteffen Prohaska, Jul 1, 2007
  2. Johannes SchindelinJul 1, 2007
  3. Steffen ProhaskaJul 1, 2007
  4. Johannes SchindelinJul 1, 2007
  5. Steffen ProhaskaJul 1, 2007
  6. Johannes SchindelinJul 1, 2007
  7. Steffen ProhaskaJul 1, 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.