Re: [naviserver-devel] Chnaged my mind: switch to mercurial
vseryakov is my username, looks oike adding openssh pub key does not work, it keeps saying SSH key is not valid Stephen Deasey wrote: On Wed, Aug 20, 2008 at 7:16 AM, Vasiljevic Zoran [EMAIL PROTECTED] wrote: On 20.08.2008, at 00:19, Stephen Deasey wrote: I think it's probably better to stay with the familiar cvs. It doesn't scare anyone, SF handles everything, and patches are probably too infrequent to for the vcs to make much difference anyway. Agree? Yes. Lets keep it simple for now. I've changed my mind about this again. It's just too much of a pain in the ass to do anything more than minor fixes without trampling on other peoples stuff, using CVS. Here's something new though: http://www.bitbucket.org/naviserver/naviserver/overview/ Fancy hosting for mercurial repos. It's like github (if you're familiar with that, very popular), but for mercurial. It's up to date for both branches of AOLserver, and naviserver with the exception of Zoran's commit the other day (I'll update that now). It also models the fact that naviserver is a fork AOLserver 4.0.10. This would have all the advantages we talked about previously, plus a couple of new ones which would be particularly helpful when developing larger changes which need a bit of back and forth development before being committed: branches a patch queues. If you look at the interface you'll see a 'fork' link. The idea is any random stranger can fork any project to make changes. They then send a pull request to you and merge the changes back, and they delete their fork. Bitbucket also supports mercurial queues, which is almost the same but a bit easier when reworking a set of patches. So the ideas is that we'd use bitbucket for hosting the mercurial repos and keep everything else as is. How does this sound? (Tell me you username on bitbucket and I'll add you to the project). - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ naviserver-devel mailing list naviserver-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/naviserver-devel - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ naviserver-devel mailing list naviserver-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/naviserver-devel
Re: [naviserver-devel] Chnaged my mind: switch to mercurial
On 11/20/08, Vlad Seryakov [EMAIL PROTECTED] wrote: vseryakov is my username, OK. I've given you write access. looks oike adding openssh pub key does not work, it keeps saying SSH key is not valid Perhaps during cut 'n paste a stray \n crept in? Worked for me. Anyway, you don't need to use ssh, ssl works just as well (http is mercurial's native transport): $ hg clone https://[EMAIL PROTECTED]/naviserver/naviserver/ ~/in/naviserver-hg btw. it seems that the bitbucket site is set up such that all repos belong to a person, so for the naviserver repo I created a 'fake' person 'naviserver' to own it. I'll send you and Zoran the password, in case I'm run over by a walrus or something. You won't need to use it on a day to day basis. It's just for adding more people to the commit list and changing the details on the website. Also, make sure you have this in your ~/.hgrc [ui] username=Vlad Seryakov [EMAIL PROTECTED] so that it matches all the other log entries, otherwise you'll be [EMAIL PROTECTED] or whatever. And for log messages note that the convention is to have a single line, like an email subject, then a blank line, then any extra explanation, in normal paragraphs. Word wrap to 70-80 characters. Use active voice, 'fix' rather than 'fixed'. No full stop. if it's a module, prefix with 'nsperm: ' or whatever. Check what's there already, you'll get the idea. And because commit and push are separate, you can check and redo as many times as you like before anything is public. If you find yourself trying to describe two things, they should have been separate commits. Mercurial makes this easy. You can commit multiple times, and then at the end push to the public repo. And clean your finger nails, and brush your teeth, and say your prayers... - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ naviserver-devel mailing list naviserver-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/naviserver-devel
Re: [naviserver-devel] Chnaged my mind: switch to mercurial
On 20.11.2008, at 20:33, Stephen Deasey wrote: And clean your finger nails, and brush your teeth, and say your prayers... Eh... brave new world... So yet another thing to learn... I guess Internet is full of docs about this and I will have fun reading it. Cheers, Zoran - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ naviserver-devel mailing list naviserver-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/naviserver-devel
Re: [naviserver-devel] Chnaged my mind: switch to mercurial
On 11/20/08, Vasiljevic Zoran [EMAIL PROTECTED] wrote: On 20.11.2008, at 20:33, Stephen Deasey wrote: And clean your finger nails, and brush your teeth, and say your prayers... Eh... brave new world... So yet another thing to learn... I guess Internet is full of docs about this and I will have fun reading it. Hopefully, it will take you about 2 minutes to get the basics, which is the advantage of mercurial over git, an otherwise great system. Clone the repository first. You need the bits on your hard drive: $ hg clone https://[EMAIL PROTECTED]/naviserver/naviserver/ $ cd naviserver ... hack hack hack... $ hg commit $ hg push Now obviously there are bells n' whistles, but the basics are easy enough that it shouldn't prevent you from getting things done. (The built-in help is excellent: hg help, hg pull --help, etc.) - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ naviserver-devel mailing list naviserver-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/naviserver-devel
[naviserver-devel] Chnaged my mind: switch to mercurial
On Wed, Aug 20, 2008 at 7:16 AM, Vasiljevic Zoran [EMAIL PROTECTED] wrote: On 20.08.2008, at 00:19, Stephen Deasey wrote: I think it's probably better to stay with the familiar cvs. It doesn't scare anyone, SF handles everything, and patches are probably too infrequent to for the vcs to make much difference anyway. Agree? Yes. Lets keep it simple for now. I've changed my mind about this again. It's just too much of a pain in the ass to do anything more than minor fixes without trampling on other peoples stuff, using CVS. Here's something new though: http://www.bitbucket.org/naviserver/naviserver/overview/ Fancy hosting for mercurial repos. It's like github (if you're familiar with that, very popular), but for mercurial. It's up to date for both branches of AOLserver, and naviserver with the exception of Zoran's commit the other day (I'll update that now). It also models the fact that naviserver is a fork AOLserver 4.0.10. This would have all the advantages we talked about previously, plus a couple of new ones which would be particularly helpful when developing larger changes which need a bit of back and forth development before being committed: branches a patch queues. If you look at the interface you'll see a 'fork' link. The idea is any random stranger can fork any project to make changes. They then send a pull request to you and merge the changes back, and they delete their fork. Bitbucket also supports mercurial queues, which is almost the same but a bit easier when reworking a set of patches. So the ideas is that we'd use bitbucket for hosting the mercurial repos and keep everything else as is. How does this sound? (Tell me you username on bitbucket and I'll add you to the project). - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ naviserver-devel mailing list naviserver-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/naviserver-devel
