måndag 19 januari 2009 10:39:53 skrev Christian von Kietzell: > Hi, > > I have a project I started in git. After a while I exported that to > CVS via git cvsexportcommit which worked quite nicely. Now, a > colleague made changes to the project - in CVS. What's the best way to > get those back into my git repository so that I'll be able to sync > back and forth between git and CVS? I had a quick look at the wiki but > couldn't find anything appropriate. > > I know of git cvsimport, of course, but that doesn't work on my > original repository. Or does it? I didn't find anything on how to > limit what to import. After all, some of the commits are already in my > repository (the ones I exported). Just continue with cvsimport, then git rebase origin. That'll drop the commits that you made when the same commit have been discovered in CVS. I personally do the cvs import into a separate repo using a cron job. That extra repo is my origin so I get up-to-date using git fetch and rebase just as if the CVS commits would come from a real repo. -- 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
