söndagen den 10 februari 2008 skrev Derek Mahar: > On Feb 10, 2008 8:15 AM, Robin Rosenberg > <robin.rosenberg.lists@xxxxxxxxxx> wrote: > > söndagen den 10 februari 2008 skrev Derek Mahar: > > As I recall it (I'm using fromcvs, not git-cvsimport) cvs HEAD get imported > > into origin which on initial import gets copied to master. So I think you > > should git rebase origin > > When it drops the extra commit, is there a way to ask git-rebase to > keep the textual change of the original commit, but use the commit > information from the imported CVS commit? This way, the resulting Git > repository would match that of another user who performs an initial > git-cvsimport of the entire CVS repository. No, for that to happen the full history must match. Maybe theoretically possible, but then, in theory, you could use only Git and not worry about CVS. If you involve CVS (or any other SCM) you must rebase on top of the CVS imported version, whether your repo is a clone or not. The changed commit to me also means I can see wheter it s a pure git checkin or whether it is from the official CVS repo, which is a "good" thing. > Can fromcvs read from a remote CVS repository via pserver or does it > only parse the RCS files directly? I have only pserver access to our > CVS repo, RCS only. Note that sometimes you have rsync access. If not politely ask the admin of the repo that you get read access to the raw files. (the CVSROOT/* files are not needed in case that is a concern). -- robin - 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
