Re: [CAF] Proposed 0.27 release of CAF
Olaf Alders [EMAIL PROTECTED] writes: Getting closer. I had it set to olaf, which I guess isn't right. The original one olaf-caf gives me this error: Client 'olaf-caf' can only be used from host 'h250.starnix.com'. That's because, by default, Perforce sets a Host field in your client profile (you can thank Windows users for that feature). To get around it, you can set an env variable to fake that host: export P4HOST=h250.starnix.com Or just delete the setting and you can use the client (aka workspace) from any host. Useful in those NFS/AFS/Samba/... environments. p4-caf works. Must have created that by accident. :) If it's all the same, I can just use that one. yeah, it's fine. I'm going to revert the open file in olaf-caf, though, and delete your two other workspaces. that ok? Great. I've done that and I think I'm up to date now. So, I would just check out files in /scratch/olaf/from-main I guess? Exactly. Although, your files aren't up to date with the changes in the main branch and I believe that some of those were Rick's changes around anonymous users (may impact your work). Let me know if you'd like me to up date them for ya. Otherwise, give this sequence a shot: p4 integ -b caf-main-to-scratch-olaf p4 resolve p4 submit (There's lots of docs on this, too. try 'p4 help integ resolve' or the online docs at: http://www.perforce.com.) Also, check out the P4MERGE environment variable (p4 help environment) if you would like to use your favourite 3-way merge tool. What's the protocol after I've made some edits that I think are ready to be looked at? Let Richard know. I've helped him bring the changes back, too. I don't mind being the regular merge custodian 'full-time', either. Regards, -- g. matthew rice [EMAIL PROTECTED] starnix, toronto, ontario, ca phone: 647.722.5301 x242 gpg id: EF9AAD20 http://www.starnix.com professional linux services products ___ caf mailing list caf@lpi.org http://list.lpi.org/cgi-bin/mailman/listinfo/caf
Re: [CAF] Proposed 0.27 release of CAF
On 9-Dec-05, at 2:59 PM, Richard Dice wrote: Hi everyone... Here is a link to a tentative 0.27 tarball, for your review and testing. http://occamstoothbrush.com/caf/CGI-Application- Framework-0.27.tar.gz I'm just looking at this right now. The login/pass thing still seems to be a mystery. Had to dig around in the sql folder to find it. rdice/foobar seems to do the trick. I'd be happy to fix this in the dev branch, but I haven't the foggiest idea of what my password was... O -- Olaf Alders [EMAIL PROTECTED] http://www.vilerichard.com -- pop tunes http://cdbaby.com/cd/vilerichard ___ caf mailing list caf@lpi.org http://list.lpi.org/cgi-bin/mailman/listinfo/caf
Re: [CAF] Proposed 0.27 release of CAF
On 8-Feb-06, at 6:54 PM, G. Matthew Rice wrote: Olaf Alders [EMAIL PROTECTED] writes: On 9-Dec-05, at 2:59 PM, Richard Dice wrote: Hi everyone... Here is a link to a tentative 0.27 tarball, for your review and testing. http://occamstoothbrush.com/caf/CGI-Application- Framework-0.27.tar.gz I'm just looking at this right now. The login/pass thing still seems to be a mystery. Had to dig around in the sql folder to find it. rdice/foobar seems to do the trick. I'd be happy to fix this in the dev branch, but I haven't the foggiest idea of what my password was... Why it's: IForgotMyPasswordAgain Thanks -- I've changed it now. of course. You should 'p4 passwd' to change that, though :) you already have your own dev area, too, BTW. It's in: //depot/caf/scratch/olaf/... You have some catch up based on the mainline. If you're comfortable bringing the changes into your codeline, it's: p4 integ -b caf-main-to-scratch-olaf I'm getting this error: olaf$ p4 integ -b caf-main-to-scratch-olaf Client 'olaf' unknown - use 'client' command to create it. But, when I try p4 client, I get this: Client: olaf Owner: olaf Any tips? I'm obviously new to this stuff! Best, Olaf -- Olaf Alders [EMAIL PROTECTED] http://www.vilerichard.com -- pop tunes http://cdbaby.com/cd/vilerichard ___ caf mailing list caf@lpi.org http://list.lpi.org/cgi-bin/mailman/listinfo/caf