Hi! At http://drupal.revisioncontrol.net/core/head you can find a bzr branch, which hourly mirrors from cvs. Also, as a proof of concept, this site is also a working Drupal install. I copied default in site to drupal.revisioncontrol.net and it's working nicely. That directory is not revisioned, of course. You need bzr 0.6 to use this branch, the 0.0.8 in cygwin won't cut it. Please understand that all this is highly experimental. You need to run first bzr get http://drupal.revisioncontrol.net/core/head in a directory, which will create you a head directory (have patience -- a progress bar is coming, for now you need patience). This head directory is also known as branch -- in bzr, a branch is just a directory, if you copy that directory to some other name, then congratulations, you have branched, it's so very easy! Actually, the get commmand above is an alias to branch (and so is clone). To update this branch, use: bzr pull and that's it. I recommend setting up an hourly cron to do this for you. If you want to actually hack core, I recommend branching first: bzr branch head drupal from the dir you issued get. Now go to your new drupal directory, hack away, and use bzr commit often, whenever you are complete with a step. You can have as many branches you want. When you want to update your own branch to head, then issue from the branch you want to update: bzr merge ../head bzr commit -m"Synching with HEAD" You want to roll a patch? bzr diff ../head You can, of course do all this against the mirror itself instead of ../head but it's much faster to use your own local mirror -- and also the http://drupal.revisioncontrol.net is running on James Blackwell's donated space and bandwidth for which I am thankful, but let's not overuse it folks, OK :) ? Later I'd like to move this our own infrastructure. If you want to work together with someone then you need to make your branch public. The first thing is that you need to copy the working tree to some webspace and then you can just: bzr push sftp://somewhere.domain/path/to/my/bzr/branch Of course, ftp://username:password@ also works. The web space does not need to run bzr or anything at all. You are storing static files. Last tip: bzr help is really helpful. Have fun! NK
Just a follow-up. To download bzr to try it out, see: http://bazaar.canonical.com/DownloadBzr Make sure the version you acquire is at least 0.6. There are a lot of older ones for different distros there but 0.6+ is required. -Angie
Hi, This is great, I think that present a couple of choices is a good thing. On a side note I do that that having a working repository like bzr and the darcs repository is a good thing. This means that we could actually set up some automated testing to make sure that anything that is committed to core works. I do have a few mirror issues with this. (I am not anti bzr because I have put forward the darcs respository, I want to see a code management system like darcs, bzr, hg, etc) I do not like the fact that we have to be running on such a new release of bzr. I am running Ubuntu Breezy and I had to download from source. I couldn't get this from the ubuntu distribution. I like that we are getting a couple of different repositories so we can experiment and be able to make an informed decision on which code management system to move too. Now we just need to work out how to make add the contributions repository in a form that can be added to the drupal installation and have automatic testing enabled. Gordon. On Thu, 2005-11-24 at 06:05 +0100, Karoly Negyesi wrote:
Hi!
At http://drupal.revisioncontrol.net/core/head you can find a bzr branch, which hourly mirrors from cvs.
Also, as a proof of concept, this site is also a working Drupal install. I copied default in site to drupal.revisioncontrol.net and it's working nicely. That directory is not revisioned, of course.
You need bzr 0.6 to use this branch, the 0.0.8 in cygwin won't cut it.
Please understand that all this is highly experimental.
You need to run first
bzr get http://drupal.revisioncontrol.net/core/head
in a directory, which will create you a head directory (have patience -- a progress bar is coming, for now you need patience). This head directory is also known as branch -- in bzr, a branch is just a directory, if you copy that directory to some other name, then congratulations, you have branched, it's so very easy! Actually, the get commmand above is an alias to branch (and so is clone). To update this branch, use:
bzr pull
and that's it. I recommend setting up an hourly cron to do this for you.
If you want to actually hack core, I recommend branching first:
bzr branch head drupal
from the dir you issued get. Now go to your new drupal directory, hack away, and use bzr commit often, whenever you are complete with a step. You can have as many branches you want.
When you want to update your own branch to head, then issue from the branch you want to update:
bzr merge ../head bzr commit -m"Synching with HEAD"
You want to roll a patch?
bzr diff ../head
You can, of course do all this against the mirror itself instead of ../head but it's much faster to use your own local mirror -- and also the http://drupal.revisioncontrol.net is running on James Blackwell's donated space and bandwidth for which I am thankful, but let's not overuse it folks, OK :) ? Later I'd like to move this our own infrastructure.
If you want to work together with someone then you need to make your branch public. The first thing is that you need to copy the working tree to some webspace and then you can just:
bzr push sftp://somewhere.domain/path/to/my/bzr/branch
Of course, ftp://username:password@ also works. The web space does not need to run bzr or anything at all. You are storing static files.
Last tip: bzr help is really helpful.
Have fun!
NK
!DSPAM:43854a06227071513039914!
of bzr. I am running Ubuntu Breezy and I had to download from source. I couldn't get this from the ubuntu distribution.
I am on Ubuntu Breezy as well (OK, Kubuntu Breezy) and I have this in sources.conf: deb http://people.ubuntu.com/~jbailey/snapshot/bzr/ ./ Works great.
Hi, On Thu, 2005-11-24 at 07:04 +0100, Karoly Negyesi wrote:
of bzr. I am running Ubuntu Breezy and I had to download from source. I couldn't get this from the ubuntu distribution.
I am on Ubuntu Breezy as well (OK, Kubuntu Breezy) and I have this in sources.conf:
deb http://people.ubuntu.com/~jbailey/snapshot/bzr/ ./
Works great.
Cool, I will add this to my source.list. But it does concern me, trusting such an important part of the drupal development process to such a new piece of software. Gordon.
But it does concern me, trusting such an important part of the drupal development process to such a new piece of software.
Huh? You are not trusting anything, you submit a patch if it does not apply then that's it. Also, --diff-options causes bzr to fall back to GNU diff...
Hi, On Fri, 2005-11-25 at 02:13 +0100, Karoly Negyesi wrote:
But it does concern me, trusting such an important part of the drupal development process to such a new piece of software.
Huh? You are not trusting anything, you submit a patch if it does not apply then that's it. Also, --diff-options causes bzr to fall back to GNU diff...
This is a single part of the process, the SCM is still a big part of the development process. Gordon.
On Thu, 2005-11-24 at 16:29 +1100, Gordon Heydon wrote:
I do not like the fact that we have to be running on such a new release of bzr. I am running Ubuntu Breezy and I had to download from source. I couldn't get this from the ubuntu distribution.
You can grab the .deb out of the dapper repository as well.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 24 Nov 2005, at 8:39 AM, Karoly Negyesi wrote:
You want to roll a patch?
bzr diff ../head
Forgot -F^f:
bzr diff --diff-options -F^f ../head
isn't this the same issue that killes has with svn?? - -- Adrian Rossouw Drupal developer and Bryght Guy http://drupal.org | http://bryght.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (Darwin) iD8DBQFDhWAfgegMqdGlkasRAmdLAJ9uqs4WgF+x1k9FFiQiEhMEbpJbrwCfUepS Yo61mXXRpMA9Sgsr7oWyJHg= =JixV -----END PGP SIGNATURE-----
Karoly Negyesi wrote:
isn't this the same issue that killes has with svn??
I do not think so, with svn you need to run an external diff, here all you needed was to give options.
Yep, I still think it is too long (maybe there is short option too?) but it is a different issue and only half the length of the svn command. Rest assured that I will not review any patch which hasn't been produced with these options, though. Cheers, Gerhard
On 24.11.2005 15:19, Gerhard Killesreiter wrote:
but it is a different issue and only half the length of the svn command.
http://drupal.org/node/16631#comment-56896 : you can put the location of the external diff into the subversion runtime configuration area, eg. [helpers] diff-cmd = /usr/bin/diff that way, your cmdline reduces to svn di -x -puN accepatble, isn't it? -- ax Yes, absolutely, I do indeed concur, wholeheartedly! - Riker, "Star Trek: The Next Generation, (Where Silence has Lease)"
On 27 Nov 2005, at 7:02 PM, Axel Kollmorgen wrote:
On 24.11.2005 15:19, Gerhard Killesreiter wrote:
but it is a different issue and only half the length of the svn command.
http://drupal.org/node/16631#comment-56896 :
you can put the location of the external diff into the subversion runtime configuration area, eg.
The problem is incoming patches. I do definitely think there is cause to run all uploaded patches against the branch specified, and then run the code style script on it, and then recreate the diff, if it applies. This would allow us to keep track of the status of a patch, if each patch is (say) weekly reapplied. So we could filter the patch queue only by patches that are still applying, we can cut down on time keeping code style intact, and we can have properly created diffs. -- Adrian Rossouw Drupal developer and Bryght Guy http://drupal.org | http://bryght.com
Karoly Negyesi wrote:
You need bzr 0.6 to use this branch, the 0.0.8 in cygwin won't cut it. Those of us on OS X with Fink can do:
fink install bzr-py24 bzr-py24-bin
(have patience -- a progress bar is coming, for now you need patience). Indeed, it wasn't fast and it looks like it's hung...but it hasn't. Patience.
-- adrinux (aka Adrian Simmons) <http://adrinux.perlucida.com> e-mail <mailto:adrinux@gmail.com> AOL/Yahoo IM: perlucida, Microsoft: adrian@perlucida.com
participants (8)
-
Adrian Rossouw -
Adrian Simmons -
Angie Byron -
Axel Kollmorgen -
Darrel O'Pry -
Gerhard Killesreiter -
Gordon Heydon -
Karoly Negyesi