I'm facing the issue of not being able to upgrade the masquerade module because there's no cvs tag for the latest 6.x-1.6 release (I use cvs and cvs_deploy). It seems that this module has moved to git.
I've logged issue #1088798: Can't upgrade to 6.x-1.6 with CVS against that module asking for advice, but I guess the question also belongs here:
What step needs to be taken by those using cvs_deploy when a module has switched to git?
Can git_deploy and cvs_deploy work together during migration, meaning while some module are on cvs and others on git?
Thanks for any help.

Comments

Freso’s picture

Freso commented
Status: Active » Fixed

There should be no issue with having git_ and cvs_deploy installed and enabled at the same time. They will only step into action if there's a .git or CVS directory (respectively) in the module's root dir, so unless you have both, they shouldn't trigger for the same modules. :)

Also, as you will have read by now in the other issue, the CVS repositories are frozen and only remain as an archive for people who happen to still be in CVS-land. All new development across drupal.org is going on in Git-land. There are various handbook pages describing how to use Git in a Drupal context, and, to be a little spammy (sorry ;)), I've documented my own move from managing my sites with CVS(/Subversion) to Git in my blog: http://freso.dk/en/2011/02/26/managing_fresodk_from_cvs_in_svn_to_git - feel free to ask me any questions there, and good luck with your own Git migration. And don't forget to have fun. :D

fmjrey’s picture

fmjrey commented

Thanks for the tips Freso.
I don't think there's enough spam about this migration topic yet!
In other words I wish there could be more info because migrating is really tedious!

In my case I wrote a Groovy Monkey script to do the migration of my 88 drupal modules/core projects.
I tried to automate as much as possible but in the end there are plenty of potential issues that require some particular attention. Also very annoying is the $Id$ tag that gets expanded by cvs because it break the comparison between the old cvs project and new git project: almost all files are flagged as different because of this tag, grrr...

My turn to spam a bit more:
Groovy Monkey is an Eclipse plugin that makes it possible run Groovy script within the IDE.
The script I wrote is quite long (850+ lines) because there's a lot of smartness to it:
- searches for drupal projects in the workspace
- detects CVS version and corresponding git version or tag
- clone remote drupal repo to central location
- each project then clones from this local clone (uses less disk space than when cloning from drupal.org several times)
- checkout the corresponding git branch/tag
- create a new local branch which name is derived from the project name
- detect files that were out of sync with CVS and copy them to the git clone, unless it's from a dev repo in which case one must manually check for upgrade path
- logging to Eclipse console and to a file

If anyone is interested I could share it, it's rather generic and configurable. The main requirements is using Eclipse as the main development platform, with each core and each module included in the workspace as one project for one site, eg site1_admin_menu site2_ admin_menu etc.
My setup involves a bit more plugins to have an easier time managing all these projects and working around the limitation of Eclipse regarding nested projects.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.