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?
How can they be handled with git-cvsexportcommit/git-cvsimport?
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.
thanks, I'll remember this for future patches.
Steffen
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
