Salutations!
My CVS account is now activated and I'd like to start introducing my patches. As I've seen, the current HEAD is marked as rc2 in the 'defines_php.lib.php3'.
I would usually gues that rc2 is branched off from rc1?
My changes shouldn't be in the current rc-cycle because I think they change a lot...what should I do now?
-- Bye, ...[ icq #21392242 | Garvin ...[ www.supergarv.de |
... *"Don't unlock doors you're not prepared to go through" Mr X to DS 4x01*
Garvin,
We all are now in bug fix mode until 2.4.0-final is released, in about 2 weeks.
So you can merge the patches that fix some bugs, if they don't disturb the rest.
Or you can post them to the patches tracker for review by others.
You can also have a look at unassigned bug in the bug tracker, find some solutions for them (for example #658668)
We all have our opinions about branching, mine is that it is too much work for me to apply bug fixes to more than one tree. Maybe I do not understand enough the branching mecanism.
Marc
Garvin Hicking wrote:
Salutations!
My CVS account is now activated and I'd like to start introducing my patches. As I've seen, the current HEAD is marked as rc2 in the 'defines_php.lib.php3'.
I would usually gues that rc2 is branched off from rc1?
My changes shouldn't be in the current rc-cycle because I think they change a lot...what should I do now?
-- Bye, ...[ icq #21392242 | Garvin ...[ www.supergarv.de |
Salve, Marc!
We all are now in bug fix mode until 2.4.0-final is released, in about 2 weeks.
Okay, then it seems like no big 'packages' like mine are submitted. I will be working on those mime/sql JS window things the next 2 weeks and will surely touch a lot of parts. So it would be great to get some notice before another one takes approach on a huger scheme.
I'll be fixing some PHP3 bugs I just found in correspondance to my own reworking, but I'm mainly working on new feature the next time.
Just a final question, I can't get the CVS to remember my password, is this somehow possible? I've got access to the repository (did a first commit), and I already put my SSH-private key via the web interface on the shell-machine. I can already login on the shell with the public key, but I am still asked every time to enter my cvs pass. Is this intentional or am I forgetting something?
-- Bye, ...[ icq #21392242 | Garvin ...[ www.supergarv.de |
... *Famous Last Words: Relax. Nothing ever happens at first level.*
Garvin Hicking wrote:
Salve, Marc!
We all are now in bug fix mode until 2.4.0-final is released, in about 2 weeks.
Okay, then it seems like no big 'packages' like mine are submitted. I will be working on those mime/sql JS window things the next 2 weeks and will surely touch a lot of parts. So it would be great to get some notice before another one takes approach on a huger scheme.
You could post patches of your work on the patch tracker so we can try it.
I'll be fixing some PHP3 bugs I just found in correspondance to my own reworking, but I'm mainly working on new feature the next time.
Just a final question, I can't get the CVS to remember my password, is this somehow possible? I've got access to the repository (did a first commit), and I already put my SSH-private key via the web interface on the shell-machine. I can already login on the shell with the public key, but I am still asked every time to enter my cvs pass. Is this intentional or am I forgetting something?
I am using ssh-agent and only have to enter my passphrase once. Then I can work with cvs without giving my password with:
export CVS_RSH=ssh cvs -z3 -d:ext:lem9@cvs1.sourceforge.net:/cvsroot/phpmyadmin ....
Marc
On Mon, Feb 03, 2003 at 01:40:22PM -0500, Marc Delisle wrote:
Okay, then it seems like no big 'packages' like mine are submitted. I will be working on those mime/sql JS window things the next 2 weeks and will surely touch a lot of parts. So it would be great to get some notice before another one takes approach on a huger scheme.
You could post patches of your work on the patch tracker so we can try it.
Definetly. I usually maintain two trees, one of the current stuff that only bugfixes go into, and another one I play around with more. For my clients that use PMA for touching their data, I give them the choice between the two.
Just because the main tree is frozen doesn't mean no development takes place.
Just a final question, I can't get the CVS to remember my password, is this somehow possible? I've got access to the repository (did a first commit), and I already put my SSH-private key via the web interface on the shell-machine. I can already login on the shell with the public key, but I am still asked every time to enter my cvs pass. Is this intentional or am I forgetting something?
I am using ssh-agent and only have to enter my passphrase once. Then I can work with cvs without giving my password with:
export CVS_RSH=ssh cvs -z3 -d:ext:lem9@cvs1.sourceforge.net:/cvsroot/phpmyadmin ....
If you spend a lot of time connected to a linux box to work on things via SSH from windows, I recommend PuTTY with key-forwarding turned on. Works like a charm.
If you are using a linux box natively instead, look at ssh-multiadd to help with ssh-agent, as well as a number of the other helpful key tools.
Again, using key-forwarding is a big help.
Salve, Robin!
You could post patches of your work on the patch tracker so we can try it.
Definetly. I usually maintain two trees, one of the current stuff that only bugfixes go into, and another one I play around with more. For my clients that use PMA for touching their data, I give them the choice between the two.
Okay, then I'll go that way. It's just you wanted to see different commits for each patch, and I am working on 4-5 items at once, which doesn't make me happy when I spend another week just to get the big patch split up again. But it's gonna work somehow.
Just a final thing which annoys me to death, I don't get this whole CVS- password system worked out.
I have my own linux box as a router and firewall and webserver. I connect to this server via SSH from my Windows machine via Putty. There I do my editing on the webserver via FTP.
With SSH I use the CVS commands to update my working directory, which I checked out using the "-d:ext:..." command.
I then created a public key on my webserver, and uploaded it to sourceforge. I now can login to the sourceforge-shell from the webserver. But still the cvs-password prompt pops up.
I guess I don't have to forward any keys using putty because my windows- machine shouldn't be involved in those whole key-issue, right? I tried to get the ssh-agent to work, but 'ssh-add' always tells me it "Could not open a connection to your authentication agent.". Even though ssh-agent is active.
But, darn, I'll go figure it out. Now off to work. :)
Regards, Garvin. -- Bye, ...[ icq #21392242 | Garvin ...[ www.supergarv.de |
... *"My name is not Dr. Death." - B.Simpson*
On Mon, Feb 03, 2003 at 09:00:00PM +0100, Garvin Hicking wrote:
Okay, then I'll go that way. It's just you wanted to see different commits for each patch, and I am working on 4-5 items at once, which doesn't make me happy when I spend another week just to get the big patch split up again. But it's gonna work somehow.
Look at it this way for later on, say we want to revert just a single feature at some point in time, one of the things you have done. If it is all in one big commit, then it is really messy to split it up later on. Code has been reverted in the past, as needed.
Additionally, when we do checkins of code, automatic emails of the checkin are sent to the phpmyadmin-cvs mailing list. I don't know about the others, but I certainly review a sizeable portion of the commit logs from that mailing list usually. Code review practices certainly help a lot in the programming world.
I then created a public key on my webserver, and uploaded it to sourceforge. I now can login to the sourceforge-shell from the webserver. But still the cvs-password prompt pops up.
I guess I don't have to forward any keys using putty because my windows- machine shouldn't be involved in those whole key-issue, right? I tried to get the ssh-agent to work, but 'ssh-add' always tells me it "Could not open a connection to your authentication agent.". Even though ssh-agent is active.
Ah, here is the first place we differ. I keep my SSH/GPG keys and other sensitive data on a 128mb USB key device. Wherever I go, I take the key with me. My PuTTY using Pagent reads the key when needed to act like ssh-agent on windows, and when I use linux, ssh-add reads the key from there as well. Those are the ONLY (well besides a backup in a safe) copies of my private keys around. I don't want what happened to Apache to happen to me as well (compromised via a stolen key with a weak passphrase).
How are you running ssh-agent on linux? I recommend "eval `ssh-agent`", those backticks are important, as they set up your shell variables to point to the agent. ssh-add uses them to put your key in place. If you capture the output of ssh-agent instead, it is also possible to have multiple shells on the same machine connected to the same ssh-agent instance.
One other thing with ssh-agent, I noticed it has a nasty tendancy to continue running at times after you log out. So throw together something to keep track of the PID and kill it on logout.
Hi Robin!
Look at it this way for later on, say we want to revert just a single feature at some point in time, one of the things you have done. If it is all in one big commit, then it is really messy to split it up later on. Code has been reverted in the past, as needed.
I see the advantages, but I can't work out how I can technically achieve this single patches.
Say I have made five different patches to the display_tbl.lib.php3. I create a patch via the 'cvs -udHwbRN' command and pipe it to a file. Should I now manually edit the huge diff-file and split it into the several patch files?
BTW, how can I apply a single external patch file to my cvs tree?
My CVS-problem BTW has disapperead. It was the 6-hour limit of sourceforge. Because I thought SSH-login worked, I thought it has to also work with cvs, but that was a wrong thought. :-O
On Tue, Feb 04, 2003 at 11:05:00AM +0100, Garvin Hicking wrote:
Hi Robin!
Look at it this way for later on, say we want to revert just a single feature at some point in time, one of the things you have done. If it is all in one big commit, then it is really messy to split it up later on. Code has been reverted in the past, as needed.
I see the advantages, but I can't work out how I can technically achieve this single patches.
Say I have made five different patches to the display_tbl.lib.php3. I create a patch via the 'cvs -udHwbRN' command and pipe it to a file. Should I now manually edit the huge diff-file and split it into the several patch files?
For the most part that can be done really easily, look up 'splitdiff'...
BTW, how can I apply a single external patch file to my cvs tree?
from outside the directory, or inside it, depending on where you took the patch from patch -d phpMyAdmin -p 1 -s --dry-run <diff_file
tweak the -d parameter (you might try '.' if you are in the directory) tweak the -p parameter (change to 0 if using '.') take out --dry-run once you don't get any errors displayed. and it will then apply.
My CVS-problem BTW has disapperead. It was the 6-hour limit of sourceforge. Because I thought SSH-login worked, I thought it has to also work with cvs, but that was a wrong thought. :-O
Ah.
Salve, Marc!
Forgot to add, that I will surely unfortunately add a whole single-commit, because after I coded the whole thing it will be impossible for me to split the whole package up again into smaller parts. I hope this is okay for this case. I'm on vacation these two weeks, so it's 'now' or 'really way later' for me. ;)
Hope I'm not bugging too much, but I'm excited about the new features to come.
-- Bye, ...[ icq #21392242 | Garvin ...[ www.supergarv.de |
... *"A burp is not an answer." - B.Simpson*
-
Marc Delisle -
me＠supergarv.de -
Robin Johnson