Hi, With all the discussion on which SCM (Source Code Management) system we should be using. There has always been talk of using SVN, and recently I proposed darcs and in the last couple of days there has been bzr. These are all good SCM's but I am wondering if we are going to not have some of the important functionality that we currently have. I think I am most likely in the minority of users that use nesting to set up a site. I know that with darcs I am going to loss this ability and I also think with bzr we would as well. Basically this is how I set up a brand new site. First I check out the core of drupal $ cvs -z9 -d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal checkout -d drupal_new drupal Using the -d option I can specify the directory to put it into. Also if I am doing a 4.6 install I add -r DRUPAL_4_6 Once I have the base setup, edited the settings, create the database, create user 1, etc. Then I go to the modules directory and I start checking out the modules that I need, with the following command to get it out of cvs. $ cvs -d:pserver:anonymous@cvs.drupal.org:/cvs/drupal-contrib checkout -d htmlarea contributions/modules/htmlarea This will check out the htmlarea module and put it into my modules directory. I repeat this for all the modules that I need. if this is a 4.6 install I will then go to the themes/engines and use the same command to checkout phptemplate, and then I will usually check out the bluemarine phptemplate theme into the themes directory like co. $ cvs -d:pserver:anonymous@cvs.drupal.org:/cvs/drupal-contrib checkout -d bluemarine-phptemplate -r DRUPAL_4_6 contributions/themes/bluemarine Now once I have done all this, keeping the site up to date is extremely simple. all I do is go to the root of the drupal install and do a. $ cvs update -dP which will not only update the core but also update the contributed modules which are in a different repository. I can also do things like upgrade between versions with a cvs update -r DRUPAL_4_7 which will do the same. This is a function of cvs that makes my life so much easier to maintain sites, and keep them current. It also makes things easier when I am doing development of my contributed modules as I do not need to copy them back to another directory to be commited, I can commit them from my working directory. I know that darcs can't do this, and I am not sure about bzr. I feel this is an underused function that really more people should know about and should really not be lost. Any SCM that is chosen needs to be done wisely, and make sure that it does fit our method of working. Because of the 2 repositories we are not what would be called normal, so we need to allow for this. Gordon. Gordon.
On 11/24/05, Gordon Heydon <gordon@heydon.com.au> wrote:
I think I am most likely in the minority of users that use nesting to set up a site. I know that with darcs I am going to loss this ability and I also think with bzr we would as well.
I do exactly the same thing for my sites. I hadn't even thought of it being affected by a change of SCM. This is one feature I'd really like to keep. andrew
andrew morton wrote:
On 11/24/05, Gordon Heydon <gordon@heydon.com.au> wrote:
I think I am most likely in the minority of users that use nesting to set up a site. I know that with darcs I am going to loss this ability and I also think with bzr we would as well.
I do exactly the same thing for my sites. I hadn't even thought of it being affected by a change of SCM. This is one feature I'd really like to keep.
I use the same with the exception that I usually link to the contributed modules' directories rather making a checkout. This also avoids having a checkout per site. I of course cannot use the single update command this way, but this is not too bad. Cheers, Gerhard
Hi, On Fri, 2005-11-25 at 02:10 +0100, Gerhard Killesreiter wrote:
andrew morton wrote:
On 11/24/05, Gordon Heydon <gordon@heydon.com.au> wrote:
I think I am most likely in the minority of users that use nesting to set up a site. I know that with darcs I am going to loss this ability and I also think with bzr we would as well.
I do exactly the same thing for my sites. I hadn't even thought of it being affected by a change of SCM. This is one feature I'd really like to keep.
I use the same with the exception that I usually link to the contributed modules' directories rather making a checkout. This also avoids having a checkout per site. I of course cannot use the single update command this way, but this is not too bad.
I did think of this, but I decided not to do it as I want to make sure that I only update the current site and not all sites. But this is 6 of 1, half a dozen of another. Actually I do have a full contributions repository checked out but I think it is really out of date. Gordon.
Op vrijdag 25 november 2005 02:10, schreef Gerhard Killesreiter:
andrew morton wrote:
On 11/24/05, Gordon Heydon <gordon@heydon.com.au> wrote:
I think I am most likely in the minority of users that use nesting to set up a site. I know that with darcs I am going to loss this ability and I also think with bzr we would as well.
I do exactly the same thing for my sites. I hadn't even thought of it being affected by a change of SCM. This is one feature I'd really like to keep.
I use the same with the exception that I usually link to the contributed modules' directories rather making a checkout. This also avoids having a checkout per site. I of course cannot use the single update command this way, but this is not too bad.
I use linking, when I run a stable drupal (463) then I can be sure that the 46 contribs fit with those. I copy modules when I want to hack them up or when I need to develop on them. In the last case, I also commit anything to my private SVN and then work from there. Esp if it is not only me wrking on the code this is really nessecary. Then all sorts of hackish scripts do nightly updates of CVS into my HEAD in svn, and with some fillding we can merge changes into our working repository. now this part is where it all gracefully fails. Both SVN and CVS are simply not fit for working across multiple repositories with multiple versions. Ber
On 25 Nov 2005, at 01:22, andrew morton wrote:
I think I am most likely in the minority of users that use nesting to set up a site. I know that with darcs I am going to loss this ability and I also think with bzr we would as well.
I do exactly the same thing for my sites. I hadn't even thought of it being affected by a change of SCM. This is one feature I'd really like to keep.
I do exactly the same, and I'd really like to keep it that way. Something else that I /hate/ about some SCM systems (like SVN) is that they make grep'ng a pain. You always end up grepping their "internal kitchen". -- Dries Buytaert :: http://www.buytaert.net/
Hi, On Fri, 2005-11-25 at 11:52 +0100, Dries Buytaert wrote:
On 25 Nov 2005, at 01:22, andrew morton wrote:
I think I am most likely in the minority of users that use nesting to set up a site. I know that with darcs I am going to loss this ability and I also think with bzr we would as well.
I do exactly the same thing for my sites. I hadn't even thought of it being affected by a change of SCM. This is one feature I'd really like to keep.
I do exactly the same, and I'd really like to keep it that way.
Something else that I /hate/ about some SCM systems (like SVN) is that they make grep'ng a pain. You always end up grepping their "internal kitchen".
Yes I hate this, I find that with darcs I have to do some fancy find to exclude _darcs from the grep. Gordon.
I know that darcs can't do this, and I am not sure about bzr.
I know that bzr can do this. http://drupal.revisioncontrol.net itself is a bzr repo AND a running drupal, check it. Your local branch can be that, too. And yes, you will be able to do this with the contrib mirror too. Regards NK
On 11/24/05, Karoly Negyesi <karoly@negyesi.net> wrote:
I know that darcs can't do this, and I am not sure about bzr.
I know that bzr can do this. http://drupal.revisioncontrol.net itself is a bzr repo AND a running drupal, check it. Your local branch can be that, too. And yes, you will be able to do this with the contrib mirror too.
Just to be clear, will it freak out if sub-directories (i.e. the modules) are from different repositories? andrew
Hi, On Thu, 2005-11-24 at 17:22 -0800, andrew morton wrote:
On 11/24/05, Karoly Negyesi <karoly@negyesi.net> wrote:
I know that darcs can't do this, and I am not sure about bzr.
I know that bzr can do this. http://drupal.revisioncontrol.net itself is a bzr repo AND a running drupal, check it. Your local branch can be that, too. And yes, you will be able to do this with the contrib mirror too.
Just to be clear, will it freak out if sub-directories (i.e. the modules) are from different repositories?
So it can't do what I and other people are doing. Gordon.
So it can't do what I and other people are doing.
Reread what you asked first. The answer is: there are plans to do some kidn of a recursive pull plugin, at this moment you need a third party tool, called config-manager to do it. Regards NK
On Fri, 25 Nov 2005 02:22:16 +0100, andrew morton <drewish@katherinehouse.com> wrote:
On 11/24/05, Karoly Negyesi <karoly@negyesi.net> wrote:
I know that darcs can't do this, and I am not sure about bzr.
I know that bzr can do this. http://drupal.revisioncontrol.net itself is a bzr repo AND a running drupal, check it. Your local branch can be that, too. And yes, you will be able to do this with the contrib mirror too.
Just to be clear, will it freak out if sub-directories (i.e. the modules) are from different repositories?
No. Here is what happening: you do a bzr get http://drupal.revisioncontrol.net/core/head , then bzr will download some control files from http://drupal.revisioncontrol.net/core/head/.bzr and based on that it'll determine what Drupal files it needs to download. Now, if you do bzr get http://drupal.revisioncontrol.net/core/head/modules/cck (no, it's not there yet!) then it'll go to bzr get http://drupal.revisioncontrol.net/core/head/modules/cck/.bzr Only thing you need is to take care that cck is not versioned for the core mirror. But as you need to explicitely bzr add foo to make foo versioned, this is not a problem. In short: a bzr branch is simply a directory with some versioned files. If you put another such directory under it, that's fine. Regards NK
download. Now, if you do bzr get http://drupal.revisioncontrol.net/core/head/modules/cck (no, it's not there yet!) then it'll go to bzr get http://drupal.revisioncontrol.net/core/head/modules/cck/.bzr
then bzr will get files from http://drupal.revisioncontrol.net/core/head/modules/cck/.bzr sorry for the typo.
I use it also. I have also a tip some people maybe not using this: do you know the tool sitecopy? its very usefull it updates your local copy of your site with the online-version so after you got with "cvs update" the new version do this: sitecopy --update --quiet mydrupalsite thats it you have updated your site at once :D ofcourse you have to set up sitecopy first but this is simple here is my ~/.sitecopyrc # Drupal Testsite # ----------------------- # The name of the project site mydrupalsite # FTP-Server server example.com # Loginname username fooo # Password password bar # dir on my pc local /home/tobi/drupal/drupal-4-6 # dir on the server remote /html/drupal # Exclude exclude /files exclude *~
Hi, This is a great tool if you only have ftp access. I use it all the time. Now I have ssh access to my web site and I user rsync which is alot better. Gordon. On Fri, 2005-11-25 at 02:59 +0100, Tobias Maier wrote:
I use it also.
I have also a tip some people maybe not using this: do you know the tool sitecopy? its very usefull it updates your local copy of your site with the online-version so after you got with "cvs update" the new version do this: sitecopy --update --quiet mydrupalsite
thats it you have updated your site at once :D
ofcourse you have to set up sitecopy first but this is simple here is my ~/.sitecopyrc
# Drupal Testsite # ----------------------- # The name of the project site mydrupalsite
# FTP-Server server example.com
# Loginname username fooo
# Password password bar
# dir on my pc local /home/tobi/drupal/drupal-4-6
# dir on the server remote /html/drupal
# Exclude exclude /files exclude *~
!DSPAM:43867532239893248454204!
participants (7)
-
andrew morton -
Bèr Kessels -
Dries Buytaert -
Gerhard Killesreiter -
Gordon Heydon -
Karoly Negyesi -
Tobias Maier