From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 01 Jul 2007 14:35:42 GMT
Subject: Re: [PATCH] cvstrack: work on imported cvs and other git branches
Message-ID: <Pine.LNX.4.64.0707011533370.4438@racer.site>
In-Reply-To: <11832957963860-git-send-email-prohaska@zib.de>

Hi,

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?

> To get the idea you can run t/t9250-git-cvstrack.sh and explore
> the git repository created in t/trash/gitwork.

Hmm. I would have expected such a non-descriptive description _after_ the 
commit message, not _in_ it.

Ciao,
Dscho