cvs update -dPf -r DRUPAL-4-7
A while ago there was a thread here about how to best update a site that was based on 4.7.x, yet used some modules that did not have the DRUPAL-4-7 branch. This was back when the tag was new and most modules had not used it yet. I found this command and was happily using it: cvs update -dPf -r DRUPAL-4-7 (the '-f' means get the files even if there is no DRUPAL-4-7 tag.) Well I'm not using it so happily anymore. Recently all the modules/*.module files were moved. So instead of modules/user.module you have modules/user/user.module. This change was made to DRUPAL-HEAD. Now, a consequence of using the CVS command above is that you update modules/user.module, but you also get a copy of modules/user/user.module. Because to CVS, its a new file that you asked for when specifying -f and -d. It's worth noting that drupal apparently finds the files in modules/ first. So my site runs with the DRUPAL-4-7 code and it took me a while to even notice this. This is just a warning to anyone else in the habit of using that command. (I'm not trying to start a XYZ is better than CVS thread.) -Dave
On Aug 21, 2006, at 11:09 AM, Dave Cohen wrote:
Well I'm not using it so happily anymore. ... Now, a consequence of using the CVS command above is that you update modules/user.module, but you also get a copy of modules/user/ user.module. Because to CVS, its a new file that you asked for when specifying - f and -d.
yup, mea culpa. there's a solution to this problem, which my cvs_rename.pl script should have done, but i didn't realize this was going to be an issue. ;) it's also problematic if you checkout using a date from before the move (-D). it's on my plate to fix this, but unfortunately, i'm going out of town in a few hours, and won't be back until sunday night. however, once i'm back, i promise i'll clean up all of these sorts of troubles. sorry for the hassle, -derek
On Monday 21 August 2006 11:09, Dave Cohen wrote:
A while ago there was a thread here about how to best update a site that was based on 4.7.x, yet used some modules that did not have the DRUPAL-4-7 branch. This was back when the tag was new and most modules had not used it yet. I found this command and was happily using it:
cvs update -dPf -r DRUPAL-4-7
(the '-f' means get the files even if there is no DRUPAL-4-7 tag.)
Well I'm not using it so happily anymore. Recently all the modules/*.module files were moved. So instead of modules/user.module you have modules/user/user.module. This change was made to DRUPAL-HEAD.
Now, a consequence of using the CVS command above is that you update modules/user.module, but you also get a copy of modules/user/user.module. Because to CVS, its a new file that you asked for when specifying -f and -d.
I'm not using the -f switch, but the same thing started happening to me. In addition to the module weirdness you mentioned, my update would start downloading /all/ contrib modules and themes. One moment it would be operating as expected and only updating core and the few modules I had specifically ased for, and the next, with no changes in subscriptions or tags or anything else, it would not be. -- Jason Flatt http://www.oadae.net/ Father of Six: http://www.flattfamily.com/ (Joseph, 13; Cramer, 11; Travis, 9; Angela; Harry, 5; and William, 12:04 am, 12-29-2005) Linux User: http://www.sourcemage.org/ Drupal Fanatic: http://drupal.org/
participants (3)
-
Dave Cohen -
Derek Wright -
Jason Flatt