Comments on: Using CVS to Upgrade a Drupal Site

By: Wish List

Wish List — Sun, 15 Mar 2009 16:51:39 +0000

I decided to use drush instead of cvs, seems easier for me.

By: Trucking Jobs

Trucking Jobs — Sun, 15 Mar 2009 16:49:54 +0000

Followed it to a T and all is well, thank you.

By: Web Design

Web Design — Sun, 15 Mar 2009 16:49:06 +0000

Thanks for the how-to, much helpful and appreciated.

By: dev mrhappymac » Blog Archive » links for 2008-12-14

dev mrhappymac » Blog Archive » links for 2008-12-14 — Sun, 14 Dec 2008 16:03:25 +0000

[...] Using CVS to Upgrade a Drupal Site (tags: drupal update cvs) [...]

By: Aaron D. Campbell

Aaron D. Campbell — Mon, 15 Sep 2008 18:25:50 +0000

Sidharth: I added some code tags around parts of your comments. It seems to have helped the double – problem. Thanks for all the info.

By: Jeffrey Scott of Typehost

Jeffrey Scott of Typehost — Mon, 15 Sep 2008 18:19:09 +0000

Sidharth – thanks for this, really excellent. I also would like to see an updated documentation that includes all the different methods and tools in one place.

By: Sidharth

Sidharth — Mon, 15 Sep 2008 17:53:10 +0000

Sorry for clogging this with comments. But wordpress is messing things up… Two ‘–’ s are being joined to one long ‘-’. In this case having ‘-’ is critical because that is what the tag is named…

So it is DRUPAL-5--1.5 with two ‘-’ between 5 and 1.5

By: Sidharth

Sidharth — Mon, 15 Sep 2008 17:49:15 +0000

Continuing above,

say you want to update the google_analytics module from version 5.x-1.5 to 5.x-1.6 then you would issue the command in the google_analytics folder:

cvs update -dP -r DRUPAL-5--1.6

-d allows any required directories in the new version (if any) to be created
-P allows any unused directories in the old version to be deleted

To simulate the command without updating:

cvs -n update -dP

NOTE: There is a small typo in my previous comment. It should be
-r DRUPAL-5--1.5 and NOT -r DRUPAL-5-1.5(with one ‘-’ only)

Also it may be instructive to see the output of:

cvs status -v README.txt

where README.txt is the readme file in the google_analytics directory…
=================================================================== File: README.txt Status: Up-to-date


   Working revision:    1.2.4.4

   Repository revision: 1.2.4.4 /cvs/drupal-contrib/contributions/modules/google_analytics/README.txt,v

   Commit Identifier:   73e24838784c4567

   Sticky Tag:          DRUPAL-5--1-6 (revision: 1.2.4.4)

   Sticky Date:         (none)

   Sticky Options:      (none)
   Existing Tags:

        DRUPAL-6--1-2                   (revision: 1.3.2.3)

        DRUPAL-5--1-6                   (revision: 1.2.4.4)

        DRUPAL-5--1-5                   (revision: 1.2.4.4)

        DRUPAL-6--1-1                   (revision: 1.3.2.3)

        DRUPAL-6--1-0                   (revision: 1.3.2.2)

        DRUPAL-5--1-4                   (revision: 1.2.4.3)

        DRUPAL-6--1                     (branch: 1.3.2)

        DRUPAL-5--1-3                   (revision: 1.2.4.3)

        DRUPAL-5--1-2                   (revision: 1.2.4.1)

        DRUPAL-5--1-1                   (revision: 1.2.4.1)

        DRUPAL-5--1-0                   (revision: 1.2)

        DRUPAL-5                        (branch: 1.2.4)

        DRUPAL-4-7                      (branch: 1.2.2)

        DRUPAL-4-6                      (branch: 1.1.2)

==========
Also these tags can be seen from the release notes link which is adjacent to the module download section on drupal.org

By: Sidharth

Sidharth — Mon, 15 Sep 2008 17:36:02 +0000

Thanks for your initial article…it caused me to think about cvs. I did some research and I think that the way you are downloading modules from cvs is not really correct.

Because you can allow drush to use CVS also. The command that drush uses to install a particular module looks like this (you need to activate the cvs download method which then becomes the default instead of wget method):

cvs -z6 -d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal-contrib checkout -d google_analytics -r DRUPAL-5--1-5 contributions/modules/google_analytics

Note:
1. The root is /cvs/drupal-contrib and not /cvs/drupal
2. The revision number is the tagged revision number of the *module* (Note: DRUPAL-5--1-5 means 5.x-1.5)

Note that if you are using cvs as a way to download modules, this will cause update status for modules to stop working for these modules. This is because the version string gets messed up. To solve this problem, please install cvs_deploy module. Read README.txt in the module directory for more information.

In summary:
1. You can use drush to download from cvs. It just allows you to issue simpler commands.
2. If you are using direct cvs commands or the drush in the cvs mode, be sure to install the drupal cvs_deploy module so that update status can still work.

Other useful commands, e.g. to simulate a command you should use the -n option (see cvs documentation).

To see the tags / branches for a particular file:

cvs status -v filename_xyz

If you think that this is a better way, can you please update the documentation to reflect the new method?

By: Aaron D. Campbell

Aaron D. Campbell — Mon, 08 Sep 2008 17:06:24 +0000

proxous and Sidharth: I’m not a CVS expert by any stretch, but isn’t the -r DRUPAL-x-x-x there so you can specify a tagged version rather than getting bleeding edge stuff?

As for CVS helping to maintain local patches, I assume that CVS works much like Subversion in this. If you have local changes, it will try to patch the local file if it can (integrate the new without losing your updates), and if it can’t, it will ask you to manually merge the files.

However, drush is very interesting to me. Are either of you familiar enough with it to be interested in writing a drush article to be posted here?