From: Johannes Schindelin Date: Sun, 01 Jul 2007 16:11:00 GMT Subject: Re: [PATCH] cvstrack: work on imported cvs and other git branches Message-ID: In-Reply-To: <4880FDC4-BAD5-49B4-871B-98259D691449@zib.de> Hi, On Sun, 1 Jul 2007, Steffen Prohaska wrote: > 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