| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| mithro | dmpayton: i'm not seeing any login attempts for you | 00:01 |
|---|---|---|
| mithro | ssh -v [email protected] | 00:03 |
| dmpayton | What part of the key do I use to login? the key I sent Lee is 3 lines long... | 00:04 |
| mithro | dmpayton: you use the non.pub part | 00:04 |
| mithro | in the verbose output it should say something like | 00:05 |
| mithro | debug1: Trying private key: /home/tim/.ssh/identity | 00:05 |
| dmpayton | mithro: Yeah, at the bottom. All that's in .ssh is a known_hosts file | 00:09 |
| mithro | dmpayton: when/where did you generate your ssh-key? | 00:09 |
| dmpayton | That's what I was about to bring up... I generated it on XP a few weeks ago. | 00:10 |
| mithro | and you probably didn't make a backup of it right? | 00:10 |
| dmpayton | mithro: I used putty-gen, and I have the files still. | 00:11 |
| mithro | dmpayton: well, lets just regen the file? | 00:12 |
| mithro | ssh-keygen | 00:13 |
| mithro | dmpayton: then you need to send me the public key part | 00:20 |
| mithro | and I will upload it | 00:20 |
| mithro | ping? | 00:24 |
| dmpayton | pong | 00:28 |
| mithro | dmpayton: emailed? | 00:28 |
| dmpayton | mithro: Sorry, the woman just got home with some wedding stuff *twitch, twitch* | 00:28 |
| mithro | dmpayton: :) | 00:28 |
| dmpayton | mithro: email? | 00:29 |
| mithro | dmpayton: give it a whirl now | 00:38 |
| mithro | May 18 00:39:35 sp3016a sshd[2120]: (pam_unix) authentication failure; logname= uid=0 euid=0 tty=ssh ruser= rhost=c-67-181-244-69.hsd1.ca.comcast.net user=derek | 00:39 |
| mithro | May 18 00:39:37 sp3016a sshd[2117]: error: PAM: Authentication failure for derek from c-67-181-244-69.hsd1.ca.comcast.net | 00:39 |
| mithro | you are trying to use password authentication.... | 00:39 |
| mithro | what is verbose saying about the ssh key? | 00:40 |
| dmpayton | debug1: Trying private key: /home/derek/.ssh/identity | 00:43 |
| dmpayton | debug1: Trying private key: /home/derek/.ssh/id_rsa | 00:43 |
| dmpayton | debug1: Trying private key: /home/derek/.ssh/id_dsa | 00:43 |
| dmpayton | Bah, got it. | 00:48 |
| mithro | May 18 00:48:15 sp3016a sshd[8147]: Accepted publickey for derek from 67.181.244.69 port 51657 ssh2 | 00:50 |
| mithro | May 18 00:48:15 sp3016a sshd[8150]: (pam_unix) session opened for user derek by derek(uid=0) | 00:50 |
| mithro | there we go :P | 00:50 |
| mithro | well that took a lot longer then it should have :/ | 00:50 |
| mithro | now you should be able to do a | 00:50 |
| mithro | cg-clone git+ssh://[email protected]/git/tpclient-pyweb | 00:51 |
| dmpayton | Doesn't help that I keep getting pulled away from the comp. :/ | 00:51 |
| mithro | dmpayton: thats okay | 00:59 |
| dmpayton | oi, brb | 00:59 |
| mithro | i'm horribly lagged | 00:59 |
| dmpayton | back | 01:05 |
| dmpayton | to update the branch, it's cg-push tpclient-pyweb git://git.thousandparsec.net/git/tpclient-pyweb.git ? | 01:07 |
| mithro | dmpayton: to push your local changes to the remote end you use cg-push just by itself | 01:12 |
| mithro | which will push to the "origin" branch | 01:12 |
| mithro | which is where you cloned from | 01:12 |
| dmpayton | mithro: I read something about having to add files individually... do I need to cg-add for each new file? or will cg-push upload all changes including new files? | 01:14 |
| mithro | okay | 01:14 |
| mithro | this is how it works | 01:14 |
| mithro | you use cg-add to add new files | 01:14 |
| mithro | you then use cg-commit, to commit changes locally | 01:15 |
| mithro | you then push the commits to the remote location | 01:15 |
| mithro | you can do multiple commits locally before you push to the remote version | 01:15 |
| dmpayton | Gotcha. | 01:15 |
| mithro | dmpayton: ie, I currently have about 10 commits in my local tpserver-py which I have yet to push | 01:17 |
| dmpayton | if I create a whole bunch of files, I can do "cg-add -a" instead of a cg-add for each file, yes? | 01:18 |
| mithro | dmpayton: not sure :P | 01:18 |
| mithro | I add each one manually | 01:18 |
| mithro | because I like to be selective | 01:18 |
| dmpayton | I see. | 01:18 |
| mithro | you use cg-status to find out what changes you have yet to commit | 01:18 |
| mithro | and cg-diff to find out the exact details | 01:19 |
| mithro | I prefer lots of small commits | 01:19 |
| dmpayton | okay. | 01:19 |
| mithro | try to keep only changes relavent to a commit together | 01:20 |
| mithro | for example, If I fix a bug - but discover another bug in the process | 01:20 |
| mithro | I like to have one commit for the first bug | 01:20 |
| dmpayton | Right. | 01:20 |
| mithro | and a second commit for the second bug | 01:20 |
| mithro | even if both the changes happened in the same file | 01:21 |
| dmpayton | Brb again. I'll be back in 15-20 mins. | 01:21 |
| mithro | dmpayton: however, I don't always follow that :P | 01:21 |
| mithro | we really should setup a commit policy and follow it | 01:21 |
| mithro | but we are a bit lazy | 01:22 |
| dmpayton | mithro: Back. | 01:44 |
| dmpayton | mithro: Nothing wrong with being lazy...it's an attribute of a great programmer! | 01:44 |
| mithro | I'm going to be disappearing in a bit | 01:47 |
| dmpayton | Alright. | 01:47 |
| dmpayton | Regarding development, am I taking care of setting it up on my server, or did you want to set it up on thousandparsec.net? | 01:48 |
| mithro | dmpayton: both eventually | 01:50 |
| mithro | but for now just work locally | 01:50 |
| dmpayton | mithro: Alright. | 01:50 |
| mithro | dmpayton: so going to push a TODO file or something? | 01:51 |
| dmpayton | How is Python setup on the tp server? (f)CGI? mod_python? | 01:51 |
| dmpayton | And yes I will. | 01:51 |
| mithro | dmpayton: no python is setup on the server | 01:55 |
| dmpayton | Alright. | 01:56 |
| mithro | dmpayton: so are you going to do this push soonish? | 01:56 |
| dmpayton | when I do cg-commit, it pulls up a text-editor. How do I confirm the commit? | 02:06 |
| nash | Just write the file and quite your editor | 02:09 |
| nash | It chacks the file has been modified, and then does the commit | 02:10 |
| mithro | nash: tired? | 02:11 |
| mithro | dmpayton: you can tell it which editor to use with the EDITOR enviroment variable | 02:12 |
| nash | mithro: Not partcicularly | 02:12 |
| nash | why? | 02:12 |
| mithro | s/quite/quit/ | 02:12 |
| mithro | s/chacks/checks/ | 02:12 |
| CIA-3 | derek tpclient-pyweb * r9395404f9e48 /todo.txt: | 02:14 |
| mithro | hrm, where is the log message :P | 02:14 |
| daxxar | What made you guys choose git to move to? | 02:15 |
| dmpayton | Musta got lost. I warned it not to wander... :P | 02:15 |
| daxxar | In comparison to mercurial, darcs, arch, bzr, etcetera. | 02:15 |
| nash | arch/bzr both suck hard. | 02:16 |
| nash | performance for both is unacceptable | 02:16 |
| daxxar | Topic is cut, btw, ends at 'cpp-ser' here ;-) | 02:16 |
| dmpayton | Same here. | 02:16 |
| nash | darcs proved it was incapble of doing one the two basic things a revision control system should be able to do - checkout code | 02:16 |
| daxxar | I'm asking because I'm looking to start using a distributed rcs instead of svn, so was hoping to be able to leech on your "research" before changing. :) | 02:17 |
| nash | It was a toss up up between hg and git | 02:17 |
| mithro | daxxar: you are correct | 02:17 |
| daxxar | haha, :-P | 02:17 |
| nash | They are the premier DRCS at this time | 02:17 |
| mithro | daxxar: darcs sucks because it consumes bastard loads of memory | 02:17 |
| mithro | mercurial was the only other real contender | 02:17 |
| dmpayton | for a log message, it's cg-commit -m message yes? | 02:17 |
| mithro | and git has more people using it | 02:17 |
| daxxar | Nothing that tipped teh scales, so to speak? | 02:17 |
| daxxar | the* | 02:17 |
| daxxar | Ok | 02:17 |
| nash | dmpayton: Or cg-commit then use your editor | 02:18 |
| daxxar | What about monotone? | 02:19 |
| daxxar | In April 2005, Monotone became the subject of increased interest in the FLOSS community after Linus Torvalds mentioned it as a possible replacement for BitKeeper in the Linux development process.[2] Instead of adopting Monotone, Torvalds wrote his own SCM system, git. Git's design uses some ideas from Monotone, but the two projects do not share any core source code. | 02:19 |
| nash | daxxar: No advocate ;-) And yeah... git is equal or better ;-) | 02:21 |
| mithro | daxxar: monotone has had some disasters :P | 02:25 |
| mithro | and is quite slow | 02:25 |
| mithro | they have broken backwards compatibility a number of times | 02:25 |
| daxxar | ok =) | 02:28 |
| daxxar | Exam-time! Have a pleasant day. :) | 02:28 |
| nash | have fun | 02:29 |
| *** nash has quit IRC | 02:38 | |
| *** Demitar has quit IRC | 03:02 | |
| *** mithro has quit IRC | 03:30 | |
| *** nash has joined #tp | 03:55 | |
| *** mithro has joined #tp | 04:08 | |
| *** TBBle has joined #tp | 04:25 | |
| *** mithro has quit IRC | 05:35 | |
| *** mithro has joined #tp | 06:22 | |
| *** mithro has quit IRC | 06:54 | |
| *** JLP has joined #tp | 07:06 | |
| *** JLP has quit IRC | 07:20 | |
| tpb | disconnected from worldforge: Ping sent at 2007-05-18T07:37:36 not replied to. | 07:39 |
| *** tpb has joined #tp | 07:39 | |
| *** ChanServ sets mode: +o tpb | 07:39 | |
| *** JLP has joined #tp | 08:34 | |
| *** mithro has joined #tp | 08:59 | |
| mithro | howdy people | 09:00 |
| mithro | ~seen dmpayton | 09:00 |
| tpb | mithro: dmpayton was last seen in #tp 6 hours, 42 minutes, and 31 seconds ago: <dmpayton> for a log message, it's cg-commit -m message yes? | 09:00 |
| dmpayton | Sorry this isn't dmpayton. This is his fiance again. | 09:01 |
| mithro | dmpayton: thats okay | 09:03 |
| mithro | just was checking that he hadn't said anything since the last time I was on | 09:03 |
| dmpayton | Okay. | 09:03 |
| *** niphree has joined #tp | 09:08 | |
| niphree | hello | 09:08 |
| mithro | hey niphree | 09:11 |
| mithro | any luck with the banks? | 09:11 |
| niphree | yes - I'll send you all details | 09:14 |
| mithro | niphree: cool! | 09:15 |
| mithro | hrm... | 09:15 |
| mithro | something just popped up and I have no idea what | 09:16 |
| mithro | ahh | 09:16 |
| mithro | niphree: are you going to have some time this week to get you all setup so you can start coding? | 09:22 |
| niphree | mithro: I'm planing to start next week. | 09:24 |
| niphree | mithro: I almost forgot to tell you. I'm going home for this weekend - I'll be back on sunday | 09:27 |
| mithro | niphree: okay | 09:27 |
| mithro | so we will get you setup monday? | 09:27 |
| niphree | ok | 09:28 |
| mithro | do you want to organise a time on monday, or should we just take it as it comes? | 09:35 |
| niphree | hmm - I should be almost whole day on IRC on monday | 09:39 |
| niphree | brb (1-2 hours) | 09:41 |
| *** niphree is now known as niphree_AFK | 09:41 | |
| *** Epyon has quit IRC | 11:07 | |
| *** niphree_AFK has quit IRC | 13:04 | |
| *** TBBle has quit IRC | 13:26 | |
| *** tuna-fish has quit IRC | 13:57 | |
| *** tuna-fish has joined #tp | 13:58 | |
| *** tuna-fish_ has joined #tp | 14:02 | |
| *** Epyon has joined #tp | 14:25 | |
| *** Demitar has joined #tp | 15:10 | |
| *** zipola has joined #tp | 15:19 | |
| *** zipola has quit IRC | 15:28 | |
| *** zipola has joined #tp | 15:28 | |
| *** dmpayton has quit IRC | 15:33 | |
| *** dmpayton has joined #tp | 15:38 | |
| *** sijmen has joined #tp | 16:11 | |
| sijmen | hi all :) | 16:11 |
| *** zipola has quit IRC | 16:14 | |
| dmpayton | 'llo sijmen | 16:16 |
| *** tuna-fish has quit IRC | 16:27 | |
| *** tuna-fish has joined #tp | 16:28 | |
| *** sijmen_ has joined #tp | 16:51 | |
| *** sijmen has quit IRC | 17:07 | |
| *** sijmen_ is now known as sijmen | 17:09 | |
| *** tuna-fish_ has joined #tp | 17:25 | |
| *** tuna-fish_ has quit IRC | 17:28 | |
| *** dmpayton has quit IRC | 18:42 | |
| *** sijmen has left #tp | 20:27 | |
| *** TBBle has joined #tp | 20:57 | |
| *** drdevice_ has quit IRC | 21:15 | |
| mithro | morning people | 23:01 |
| *** daxxar has quit IRC | 23:14 | |
| *** daxxar has joined #tp | 23:14 | |
| *** mithro has quit IRC | 23:15 | |
| *** mithro has joined #tp | 23:15 | |
| mithro | morning people | 23:16 |
| *** mithro has quit IRC | 23:19 | |
| *** mithro has joined #tp | 23:19 | |
| mithro | hrm... | 23:20 |
| *** mithro has quit IRC | 23:21 | |
| *** mithro has joined #tp | 23:22 | |
| mithro | morning people | 23:23 |
Generated by irclog2html.py 2.5 by Marius Gedminas - find it at mg.pov.lt!