| *** kristallpirat has joined #cc | 00:02 | |
| *** kristallpirat has quit IRC | 00:18 | |
| *** pmiller has quit IRC | 00:22 | |
| *** isforinsects has joined #cc | 00:51 | |
| *** hdworak has joined #cc | 03:40 | |
| *** Vanzetti_ has joined #cc | 03:50 | |
| Vanzetti_ | hi | 03:50 |
|---|---|---|
| Vanzetti_ | I'm searching for someone that participate to the oenutch development | 03:51 |
| *** mecredis has quit IRC | 05:26 | |
| *** mecredis has joined #cc | 05:26 | |
| *** efphe has joined #cc | 05:42 | |
| efphe | hi alls | 05:42 |
| efphe | we're creating an italian company and we designed a logo | 05:43 |
| efphe | now, we're trying to work to protect it from commercial theft or abuses | 05:43 |
| efphe | we would use CC. which is your opinion? is a good solution? is a logo CC-registered internation protected? | 05:44 |
| efphe | *international* | 05:44 |
| *** pmiller has joined #cc | 06:05 | |
| Vanzetti_ | does someone know nyergler that is one of oenutch developper ? | 06:09 |
| hdworak | he's here but not now | 06:46 |
| hdworak | they're all based in San Francisco time zone | 06:46 |
| hdworak | efphe: you should consult a local lawyer and trademark expert | 06:47 |
| hdworak | the trademark helps you to win a case in a court | 06:48 |
| Vanzetti_ | hdworak: ok thank you, i'll wait. I have lots of questions about oenutch :) | 06:49 |
| hdworak | you can check our logs | 06:49 |
| hdworak | see the topic | 06:49 |
| hdworak | (not related to oenutch) | 06:49 |
| hdworak | in the meantime | 06:49 |
| Vanzetti_ | ok thanks you | 06:50 |
| Vanzetti_ | hdworak: what is his nickname ? | 06:51 |
| hdworak | nathany | 06:52 |
| Vanzetti_ | thank you | 06:53 |
| Vanzetti_ | hdworak: you're a developper pour cclearn ? | 07:05 |
| hdworak | no, I'm not | 07:10 |
| Vanzetti_ | :) ok | 07:24 |
| *** rejon has quit IRC | 08:12 | |
| *** pmiller has quit IRC | 08:45 | |
| *** kristallpirat has joined #cc | 08:46 | |
| *** mrgarin has joined #cc | 08:46 | |
| hdworak | paulproteus: what IDE are you using for Python under Ubuntu/Debian ? | 08:46 |
| *** cacimar has joined #cc | 08:51 | |
| *** greg-g has joined #cc | 09:10 | |
| hdworak | is there any git/pylons/genshi integration within it? | 09:14 |
| *** MRK has joined #cc | 09:25 | |
| hdworak | I'm checking out Eclipse+Pydev | 09:26 |
| hdworak | ships in Ubuntu packages | 09:27 |
| *** MRK has left #cc | 09:27 | |
| Vanzetti_ | it's time to wake up in san francisco ! | 09:32 |
| *** rlv has joined #cc | 09:40 | |
| *** cacimar has quit IRC | 09:45 | |
| *** grahl has joined #cc | 10:07 | |
| *** nathany has joined #cc | 10:07 | |
| paulproteus | Vanzetti_, That's right! | 10:10 |
| paulproteus | Vanzetti_, nathany is an oenutch developer. | 10:10 |
| paulproteus | hdworak, I don't use any IDE, sometimes Emacs, sometimes the plain nano text editor. | 10:11 |
| Vanzetti_ | paulproteus: great, because I have some questions about OAI-PMH implementation | 10:14 |
| Vanzetti_ | We are watching for another solution that our actual search engine, and a OAI-PMH implementation in nutch can be really great! | 10:15 |
| Vanzetti_ | well for me it's time to leave from work | 10:15 |
| Vanzetti_ | see you soon | 10:15 |
| nathany | Vanzetti_: we're using OAI-PMH as a way to direct a crawl, not searching it directly | 10:23 |
| nathany | so we pull in resources via feeds, OAI-PMH, etc, index the metadata and then use the normal nutch crawler to create a full text index | 10:23 |
| hdworak | paulproteus: thanks | 10:27 |
| hdworak | nathany: hi. are you using any Python IDE? | 10:27 |
| nathany | hdworak: only if you count emacs | 10:27 |
| hdworak | ok, thanks | 10:27 |
| hdworak | do you use any standard of Python code documentation? | 10:28 |
| hdworak | like Javadoc | 10:28 |
| hdworak | but for Python | 10:29 |
| hdworak | ? | 10:29 |
| paulproteus | We don't right now, really; I stick to tests as documentation, plus use docstrings (but never extract them automatically like the JavaDoc reports). | 10:29 |
| hdworak | what Python version are your servers running? | 10:30 |
| hdworak | is it okay to go with 2.5? | 10:30 |
| paulproteus | Yes, 2.5 is good. | 10:30 |
| hdworak | ok | 10:30 |
| paulproteus | http://track.dhl-usa.com//atrknav.asp?ShipmentNumber=55941825634 is my laptop being lost by DHL. | 10:30 |
| nathany | paulproteus: you had to ship it back? | 10:31 |
| paulproteus | Yeah, they replaced the hinge and the motherboard. | 10:31 |
| paulproteus | The motherboard for the hanging, and the hinge for being totally broken. | 10:31 |
| nathany | heh | 10:31 |
| paulproteus | It's not clear that I had no hand in these issues. | 10:31 |
| hdworak | is Memphis a shipment capital of USA? | 10:32 |
| hdworak | all Google packages go through there | 10:32 |
| hdworak | :) | 10:32 |
| nathany | hdworak: it's in the middle, FedEx is based there | 10:32 |
| nathany | paulproteus: you'll be pleased to know that Frank is a member of the ThinkPad club as well | 10:33 |
| paulproteus | Fill out your membership application today! | 10:34 |
| hdworak | do thinkpads still ship with this micro joystick dot thing? | 10:34 |
| paulproteus | Ya. | 10:35 |
| hdworak | ... | 10:36 |
| *** stevel has joined #cc | 10:48 | |
| hdworak | so basically the final result is a Python egg? | 10:49 |
| hdworak | with all these installation files, readmes, docs, and config, controllers, model, public etc.? | 10:50 |
| paulproteus | I'd prefer to say the final result is a directory with those things. | 10:50 |
| hdworak | is this what should be in the git repo? | 10:50 |
| hdworak | yes, the contents of an egg | 10:51 |
| hdworak | starting from the egg root directory | 10:51 |
| hdworak | ? | 10:51 |
| * paulproteus nods | 10:51 | |
| hdworak | :) | 10:51 |
| *** kristallpirat has quit IRC | 10:53 | |
| hdworak | if I use my real email in the git metadata, will it publish in a non-spam protected manner somewhere on the WWW? | 10:54 |
| hdworak | like in a ViewCVS equivalent | 10:54 |
| paulproteus | Yes, in the gitweb. | 10:54 |
| paulproteus | "Spam protected" email addresses are a losing battle, it seems to me. | 10:55 |
| paulproteus | Just let everyone have your address and then filter, is what I say. | 10:55 |
| hdworak | well, I'm getting less than one spam letter a day | 10:55 |
| hdworak | so is it all right to commit under a fake email? | 10:55 |
| paulproteus | Hmph, I'd much rather you not. | 10:56 |
| paulproteus | (About that many slip through my spam filter, but I get 100-1000 a day.) | 10:56 |
| paulproteus | Well, fine, you can "spamguard" it so long as it's obvious | 10:56 |
| paulproteus | Like "hugo<remove_this>@domain.tld" | 10:57 |
| hdworak | ok, in this case I shall set up a new email account for this | 10:57 |
| hdworak | no worries | 10:57 |
| *** mrgarin_ has joined #cc | 11:03 | |
| *** mrgarin has quit IRC | 11:10 | |
| *** nkinkade has joined #cc | 11:13 | |
| paulproteus | Yay, suggestion storage works. | 11:29 |
| paulproteus | Also, being able to go back one revision from your current one and start a new branch is pretty cool. | 11:30 |
| paulproteus | That way, when you are building a feature and everything suddenly breaks, you just revert that but are still able to see the patch that you committed (so you can revise it) in gitk. | 11:31 |
| *** mrgarin_ has quit IRC | 11:34 | |
| *** ankitg has joined #cc | 11:52 | |
| nathany | paulproteus: what are the dates for debconf again? | 12:06 |
| paulproteus | Aug 10-16; I tentatively (haven't told you yet) plan to spend the week before in Argentina on vacation. | 12:06 |
| nathany | portland + argentina = 3 weeks out (not objecting, just noting) | 12:07 |
| nathany | anyway, coolio | 12:07 |
| paulproteus | It's true; I'll be back while everyone's out in Sapporo, if it's any consolation. | 12:08 |
| paulproteus | It'll just be me, NK, and the interns. | 12:09 |
| paulproteus | We'll be overrun! | 12:09 |
| paulproteus | nkinkade, I'm going to borrow about 60GiB on the CC backup drive for the day; there's about 3x that free right now, so I figure it's no big deal. | 12:09 |
| nathany | paulproteus: assuming everyone else goes to Sapporo | 12:09 |
| paulproteus | Sure. | 12:09 |
| nathany | but true, i looked at the dates wrong, thought it was 3 weeks back-to-back-to-back | 12:10 |
| nkinkade | paulproteus: No problem re: 60GB. | 12:10 |
| *** hdworak has quit IRC | 12:27 | |
| paulproteus | ankitg, SYN | 12:27 |
| ankitg | paulproteus: I have no idea what SYN is ... but since you pinged me, I am assuming you've got the data! :) | 12:28 |
| paulproteus | ankitg, I want to chat with you and tell you how to get the data. | 12:28 |
| paulproteus | Is there a wiki page with a list of which data sources you want me to give you? | 12:28 |
| ankitg | not yet ... wanted to take a look at the data so I could add a realistic time-line to it ... not much else belongs on the wiki page ... let me just fetch the list for you | 12:29 |
| *** hdworak has joined #cc | 12:29 | |
| paulproteus | Cool, let's handle that now while I feel like I have a spare few cycles. | 12:30 |
| ankitg | 1) logs for creativecommons.org/license | 12:30 |
| ankitg | 2) logs for i.creativecommons.org and creativecommons.org/images/licenses | 12:30 |
| ankitg | 3) logs of creativecommons.org/licenses | 12:30 |
| ankitg | 4) logs for search.creativecommons.org | 12:30 |
| paulproteus | nkinkade, Are the above all in Amazon S3? | 12:30 |
| paulproteus | nkinkade, What's the best way to give ankitg read access to them? | 12:30 |
| *** ajbrooks has joined #cc | 12:31 | |
| nkinkade | paulproteus: ankitg: Yes, all of the proxy and Apache logs are on Amazon S3. | 12:32 |
| nkinkade | ankitg: Do you need access to that? | 12:32 |
| paulproteus | nkinkade, He does. | 12:32 |
| nkinkade | But warning, there are probably well over 100GB of logs, so it may not be practical to download them, unless you've got astounding bandwidth. | 12:32 |
| ankitg | paulproteus: hmmm ... though I am still confused ... do I really have access, I didn't know ... where do I find this again? | 12:34 |
| paulproteus | ankitg, You don't have access yet; I don't remember how to grant access so I'm asking nkinkade how. (-: | 12:35 |
| ankitg | paulproteus: ah ... and I am assuming a URL would follow? (-: | 12:35 |
| *** greg-g has quit IRC | 12:37 | |
| paulproteus | They're on S3, and you'll have to use special tools to interact with Amazon S3. | 12:38 |
| paulproteus | nkinkade suggests s3sync. | 12:38 |
| ankitg | I am on a mac ... | 12:38 |
| hdworak | ok, e-mail issue resolved :) | 12:38 |
| paulproteus | Are you familiar with the command line ankitg? | 12:38 |
| paulproteus | If so, you should probably try to use this tool in ruby called s3sync. | 12:38 |
| ankitg | paulproteus: I have a feeling I will be ... | 12:38 |
| *** mrgarin has joined #cc | 12:38 | |
| paulproteus | ankitg, But you might want to spend a moment learning about Amazon S3's data storage model, perhaps by reading the s3sync documentation. | 12:39 |
| paulproteus | I'm going to email you two keys you'll need to plug into whatever tool you use; they're how to access the data on S3. | 12:39 |
| ankitg | paulproteus: will do ... | 12:39 |
| nkinkade | ankitg: s3sync is written in Ruby, I think, so I don't see why it couldn't be used on a Mac, unless there is no implementation of Ruby on a Mac. | 12:39 |
| ankitg | paulproteus: thanks ... awaiting email and reading up on S3 ... | 12:40 |
| paulproteus | You'll be reading from our private data stash since these haven't been scrubbed for public viewing. | 12:40 |
| nkinkade | But there are quite a lot of tools out there to interact with Amazon S3. | 12:40 |
| ankitg | nkinkade: yes there is a ruby implementation on the mac ... | 12:40 |
| ankitg | paulproteus: would it make things easier if I sign an NDA or something? | 12:41 |
| paulproteus | Mike didn't say you would have to, and I presume he would have. | 12:41 |
| hdworak | I'm gonna give this Eclipse+Pydev a shot | 12:41 |
| hdworak | looks promising | 12:41 |
| paulproteus | I hear fairly good things. | 12:41 |
| ankitg | paulproteus: ah ... well if it helps, let me know ... | 12:41 |
| ankitg | paulproteus: I *was* looking forward to meeting you in Sapporo ... this time I can finally make it for the iSummit ... | 12:42 |
| hdworak | http://www.imagesduo.com/uploads/593385UDU2965tPC8lNwV2vs7uWmuhGSygUNE.png | 12:43 |
| hdworak | help, help | 12:46 |
| paulproteus | pleh | 12:46 |
| hdworak | do you know what's wrong with the following? | 12:46 |
| hdworak | git push git@code.creativecommons.org:/validator -all | 12:46 |
| paulproteus | hyphen hyphen all | 12:47 |
| paulproteus | Not "hyphen all" | 12:47 |
| paulproteus | And also I'd put that before git@code.creativecommons.org | 12:47 |
| paulproteus | and it should be git@code.creativecommons.org:validator.git not "git@code.creativecommons.org:/validator" | 12:47 |
| *** hdwora1 has joined #cc | 12:48 | |
| *** hdworak has quit IRC | 12:48 | |
| *** hdwora1 is now known as hdworak | 12:48 | |
| paulproteus | <hdworak> git push git@code.creativecommons.org:/validator -all | 12:48 |
| paulproteus | <paulproteus> hyphen hyphen all | 12:48 |
| paulproteus | <paulproteus> Not "hyphen all" | 12:48 |
| paulproteus | <paulproteus> And also I'd put that before git@code.creativecommons.org | 12:48 |
| paulproteus | <paulproteus> and it should be git@code.creativecommons.org:validator.git not "git@code.creativecommons.org:/validator" | 12:48 |
| hdworak | thanks | 12:48 |
| hdworak | should the directory be named validator.git ? | 12:51 |
| hdworak | http://nopaste.org/p/aQJSykqor/txt | 12:51 |
| hdworak | my previous steps: http://www.4inarow.net/blog/?p=4 | 12:52 |
| hdworak | :( | 12:52 |
| paulproteus | What I do is add a remote first. | 12:54 |
| paulproteus | git add remote origin git@code.creativecommons.org:validator.git | 12:54 |
| paulproteus | git push --all origin | 12:54 |
| paulproteus | I'm not sure that would address this particular problem. What's "git status" say, out of curiosity? | 12:54 |
| paulproteus | nkinkade, Turns out that ThinkPad system image is only 7.6GiB (compressed with lzop, a cheesy and fast compressor). | 12:55 |
| hdworak | http://nopaste.org/p/asyjc8xhf/txt | 12:55 |
| hdworak | ok, this makes sense, I should put that in some kind of branch | 12:55 |
| hdworak | not in the root | 12:55 |
| nkinkade | paulproteus: Which system image is that? | 12:56 |
| hdworak | git add remote origin git@code.creativecommons.org:validator.git | 12:58 |
| hdworak | fatal: pathspec 'remote' did not match any files | 12:58 |
| paulproteus | hdworak, Wait, hold on. | 12:58 |
| paulproteus | hdworak, The problem seems to be that you have not run 'git commit' yet. | 12:59 |
| paulproteus | You must make a local commit, and then push that to the remote. | 12:59 |
| hdworak | I did that after git add * | 12:59 |
| paulproteus | What's the "git log" output? | 12:59 |
| hdworak | fatal: bad default revision 'HEAD' | 12:59 |
| paulproteus | hdworak, Did you ever write "git commit"? | 12:59 |
| paulproteus | nkinkade, This is the fresh T43 Lenovo system image in case I want to restore it some other time. | 12:59 |
| hdworak | yes | 12:59 |
| paulproteus | What if you run 'git commit' now? | 13:00 |
| hdworak | git init, git add *, git commit, git config user.email "...", git config user.name "hugo.dworak" | 13:00 |
| paulproteus | Does that fix the 'git log' complaint? | 13:00 |
| hdworak | it redirected me to nano | 13:00 |
| paulproteus | Yes, and did you enter a commit message? | 13:01 |
| nkinkade | paulproteus: Ah, I see. Windows XP? Vista? | 13:01 |
| hdworak | yes | 13:01 |
| paulproteus | nkinkade, I think XP. | 13:01 |
| hdworak | "Initial import", then saved and quit, then I get flooded with "create mode" messages | 13:01 |
| nkinkade | What happened to the good ole' days when a base system, uncompressed could be less than 500MB. | 13:01 |
| hdworak | and I get git log fine | 13:01 |
| hdworak | I'm pushing | 13:02 |
| hdworak | seems it worked | 13:02 |
| hdworak | now is it on-line so I can see it? (via WWW) | 13:02 |
| paulproteus | hdworak, Great - do you now realize what the problem was? | 13:02 |
| paulproteus | hdworak, http://code.creativecommons.org/viewgit | 13:02 |
| hdworak | not really, 'cause I had "git commit" as the third commit I've issued | 13:03 |
| hdworak | commit=command | 13:03 |
| paulproteus | But you clearly didn't do a commit. | 13:03 |
| paulproteus | Since 'git log' said there was nothing committed (in its own bizarre way). | 13:03 |
| hdworak | it's in my .bash_history :) | 13:03 |
| paulproteus | Did you really use commas instead of semicolons, also? | 13:03 |
| paulproteus | hdworak, If you don't enter a commit message, then it presumes you must have not wanted to commit. | 13:03 |
| hdworak | those were separate commands | 13:03 |
| paulproteus | So perhaps you exited nano rather than typed a commit log message there? | 13:03 |
| hdworak | yeah, it did not open nano before | 13:04 |
| hdworak | ok | 13:04 |
| hdworak | I see what the problem was now | 13:04 |
| hdworak | it's the fault of the tutorial I was following | 13:04 |
| hdworak | sorry | 13:04 |
| hdworak | http://www.4inarow.net/blog/?p=4 | 13:04 |
| hdworak | they list the command "git commit" BEFORE credentials | 13:05 |
| paulproteus | Curious. | 13:05 |
| hdworak | and git DID give me a message about that | 13:05 |
| hdworak | although I thought it's okay | 13:05 |
| paulproteus | Okay, great. (-: | 13:06 |
| hdworak | ok, so this in the master branch | 13:10 |
| hdworak | *this is in* | 13:10 |
| hdworak | I can't see the e-mail address in this application | 13:11 |
| hdworak | just a username | 13:11 |
| hdworak | but viewgit looks cool | 13:11 |
| hdworak | would it be possible to fool around with repository for now and once I feel comfortable with it, have a clean start? | 13:12 |
| paulproteus | Sure if you like. | 13:12 |
| hdworak | :) | 13:13 |
| *** hdwora1 has joined #cc | 13:16 | |
| *** hdworak has quit IRC | 13:16 | |
| hdwora1 | ... | 13:16 |
| *** hdwora1 is now known as hdworak | 13:17 | |
| *** ankitg is now known as ankitg|away | 13:26 | |
| *** ankitg|away is now known as ankitg | 13:28 | |
| *** hdwora1 has joined #cc | 13:29 | |
| *** hdworak has quit IRC | 13:29 | |
| *** hdwora1 is now known as hdworak | 13:29 | |
| *** rlv has quit IRC | 13:36 | |
| *** ankitg is now known as ankitg|working | 13:38 | |
| hdworak | is it possible be for me to remove something permantently from the git repository? | 13:39 |
| *** grahl has quit IRC | 13:49 | |
| hdworak | launch? | 13:57 |
| hdworak | lunch? | 13:57 |
| hdworak | :) | 13:57 |
| nathany | hdworak: not through normal means | 13:59 |
| nathany | it's typically undesirable -- it's a part of history, good or bad | 13:59 |
| nathany | of course, if you've accidentally committed a password, etc, then you use "un-normal" means :) | 13:59 |
| hdworak | roger that | 13:59 |
| hdworak | un-normal = bothering you? | 13:59 |
| hdworak | or can I do that remotely? | 14:00 |
| nathany | un-normal == "mucking in the actual repository" | 14:00 |
| nathany | not sure about git | 14:00 |
| nathany | i know with svn it has to be done on the server | 14:00 |
| nathany | ask paulproteus | 14:00 |
| hdworak | thanks | 14:00 |
| paulproteus | hdworak, We'll work it out. I personally think you shouldn't worry much about removing things from history. | 14:01 |
| hdworak | paulproteus: do I have the permissions on git to "muck" the repository? | 14:01 |
| paulproteus | Just let history stand, the way things happened. | 14:01 |
| *** efphe has left #cc | 14:01 | |
| hdworak | it's just right now I'm playing with the git (like committing a "test" branch etc.) | 14:01 |
| hdworak | and I don't want to bother you if I can clean it up after I'm done | 14:01 |
| hdworak | brb | 14:02 |
| *** hdworak has quit IRC | 14:02 | |
| paulproteus | Speaking of lunch, though.... | 14:09 |
| *** mrgarin_ has joined #cc | 14:09 | |
| paulproteus | !icanhazcurry | 14:09 |
| paulproteus | Hmm, no bot. | 14:09 |
| *** Sam__ has joined #cc | 14:15 | |
| *** ankitg|working has quit IRC | 14:17 | |
| *** mrgarin has quit IRC | 14:25 | |
| paulproteus | lunch soon, nathany? I'm going to do a pick up order from http://www.modernmexican.com/mayasf/menu.nextdoor.htm | 14:27 |
| nathany | paulproteus: i think ml and i are going for curry shortly | 14:27 |
| paulproteus | Is this the kind of lunch I can join you for, or a secret evil genius planning session? | 14:33 |
| *** Sam__ is now known as Ducky | 14:34 | |
| *** jgay has joined #cc | 14:43 | |
| *** rejon has joined #cc | 15:24 | |
| *** rejon has quit IRC | 15:29 | |
| *** rejon has joined #cc | 15:29 | |
| *** hdworak has joined #cc | 15:37 | |
| *** Sam__ has joined #cc | 15:39 | |
| *** Ducky has quit IRC | 15:39 | |
| *** Sam__ is now known as Ducky | 15:43 | |
| hdworak | any1 here? | 15:54 |
| hdworak | paulproteus: ? | 15:54 |
| paulproteus | hdworak, Hi, sure. | 15:54 |
| hdworak | wow, you have a really quick reply | 15:54 |
| hdworak | ok, so my question is: do you guys work on the local repositories or actually it's like this: | 15:54 |
| hdworak | you work on a local project directory and when you're happy with the results | 15:54 |
| hdworak | you copy that to some other directory which is a local git repository | 15:55 |
| hdworak | and then commit | 15:55 |
| hdworak | how's that resolved? | 15:55 |
| *** rejon has quit IRC | 15:55 | |
| paulproteus | This question is totally strange. | 15:55 |
| paulproteus | Let me tell you how I work. | 15:55 |
| hdworak | :( | 15:55 |
| paulproteus | 1. git clone git@code.creativecommons.org:herder.git | 15:55 |
| paulproteus | 2. Run my tests | 15:56 |
| hdworak | you check out for the latest copy | 15:56 |
| paulproteus | (Note everything works) | 15:56 |
| hdworak | you do unit tests then, right? | 15:56 |
| paulproteus | That gets me a local branch called master that tracks the remote branch called master. | 15:56 |
| paulproteus | Right. | 15:56 |
| hdworak | ok | 15:56 |
| paulproteus | Then if I want to add a fewature, I: | 15:56 |
| paulproteus | $ git checkout -b name_of_my_feature | 15:56 |
| paulproteus | $ {do some work} | 15:56 |
| hdworak | yeah, you create a new branch named by this feature | 15:57 |
| paulproteus | Then I just work on the branch, and add some tests, and when it passes the tests I added, I do a final commit, then: | 15:58 |
| paulproteus | $ git checkout master | 15:58 |
| paulproteus | $ git merge name_of_my_feature | 15:58 |
| paulproteus | $ git branch -d name_of_my_feature # feature exists, so branch can be deleted | 15:58 |
| paulproteus | $ git push | 15:59 |
| hdworak | so if I have created the "test" branched remotely, I can delete that from the server? | 15:59 |
| hdworak | or you just remove the local branch? | 15:59 |
| *** greg-g has joined #cc | 15:59 | |
| paulproteus | You can remove it from the server or locally. | 15:59 |
| hdworak | :) | 15:59 |
| paulproteus | I was going to say, if my local feature branch will last more than a day, then I do push it remotely also. | 15:59 |
| hdworak | so how to remove something remotely? | 16:00 |
| hdworak | like the "test" branch | 16:00 |
| paulproteus | Then once I am done with it, I delete it remotely and locally. | 16:00 |
| hdworak | with branch -d ? | 16:00 |
| paulproteus | Sure. | 16:00 |
| hdworak | or is that for a local? | 16:00 |
| hdworak | error: Cannot delete the branch 'test' which you are currently on. | 16:00 |
| paulproteus | git branch -d deletes the local branch. | 16:01 |
| paulproteus | git push origin :refs/heads/test # will delete the remote test branch | 16:01 |
| paulproteus | Obviously don't delete the branch you're on. | 16:01 |
| hdworak | ok | 16:01 |
| hdworak | I switched via git checkout master | 16:01 |
| paulproteus | First "git checkout master" to switch branches (or to something other than master). | 16:01 |
| paulproteus | Great. | 16:01 |
| hdworak | To git@code.creativecommons.org:validator.git | 16:02 |
| hdworak | - [deleted] test | 16:02 |
| hdworak | ok | 16:02 |
| hdworak | and is that REALLY deleted remotely? | 16:02 |
| paulproteus | Check in gitweb. | 16:02 |
| hdworak | or is that simply moved to some .tricky_hidden.folder ? | 16:02 |
| paulproteus | But yes, I think so. | 16:02 |
| hdworak | I already did, it's gone | 16:02 |
| paulproteus | It's gone, for real. | 16:03 |
| hdworak | :) | 16:03 |
| hdworak | ok, that was all I was asking | 16:03 |
| hdworak | and can I remove one specific file remotely? | 16:03 |
| hdworak | instead of erasing the whole branch? | 16:03 |
| hdworak | 'cause localy I just git rm filename | 16:03 |
| paulproteus | Great. (-: | 16:03 |
| hdworak | so I remove, say, README from the local branch | 16:04 |
| hdworak | but it's still on the srv | 16:04 |
| paulproteus | Keep in mind you can have as many local and remote branches as you like. | 16:04 |
| hdworak | if you're tired of my questions, I'll google :) | 16:04 |
| paulproteus | When you say it's "on the server", do you mean the file exists in some revision that is labeled as being the HEAD of a branch? | 16:05 |
| hdworak | HEAD = is the most up-to-date super-official branch? | 16:05 |
| hdworak | or not branch, but commit | 16:05 |
| hdworak | ? | 16:05 |
| paulproteus | If so, which remote (i.e., on the server) branch do you mean still has the file? | 16:05 |
| hdworak | yeah, HEAD is the latest commit | 16:05 |
| paulproteus | HEAD is the latest commit on a particular branch. | 16:06 |
| hdworak | yeah | 16:06 |
| hdworak | ok | 16:06 |
| hdworak | so let's say I have README in a specific branch in several commits | 16:06 |
| hdworak | and I want to erase README from all the commits in that branch | 16:06 |
| hdworak | is that possible without root? | 16:06 |
| hdworak | ;) | 16:06 |
| paulproteus | Ew, gross. | 16:06 |
| paulproteus | Don't do that, that's rewriting history. | 16:06 |
| paulproteus | Why rewrite history? | 16:06 |
| hdworak | sheer curiosity | 16:07 |
| paulproteus | Why not just remove it in the current one, and let people go back in time if they really need? | 16:07 |
| paulproteus | You can do it, if you insist, but I won't help you. (-; | 16:07 |
| paulproteus | man git-filter-branch | 16:07 |
| hdworak | yeah, and those funny filters I've read about in the manual you gave me a link to | 16:07 |
| hdworak | pretty neat stuff like regex support, huh? | 16:08 |
| paulproteus | Yeah, totally. | 16:08 |
| paulproteus | But do read the WARNING in e.g. http://www.kernel.org/pub/software/scm/git/docs/git-filter-branch.html . | 16:08 |
| hdworak | but what's the biggest power over the CVS/SVN ? that we have SHA1 on every file and no duplicates on srv? | 16:08 |
| paulproteus | Easy branching. | 16:09 |
| paulproteus | And local branches. | 16:09 |
| paulproteus | The biggest difference really is the local branches. | 16:09 |
| paulproteus | There are other differences, but that's the one that really matters in cvs/svn vs. all the distributed revision control systems. | 16:09 |
| paulproteus | If you can do commits locally, then you should have more commits. | 16:09 |
| paulproteus | And then there are features like "git bisect". | 16:10 |
| paulproteus | Also the support for branches and merging is much, much better. | 16:10 |
| hdworak | ok | 16:10 |
| hdworak | but then again is there anything more I need to master for GSOC when it comes to git? | 16:10 |
| hdworak | as I'm the sole developer, I do not even need to checkout, right? | 16:11 |
| paulproteus | Well, I intend to pop in and add tests and review your code. | 16:11 |
| paulproteus | What do you mean, "do not even need to checkout"? | 16:11 |
| paulproteus | You need to push to the central repository so I can clone it and look at your progress. | 16:11 |
| hdworak | I mean, if I would be the only person working on the code, I do not have to check if things have changed (download the latest version) | 16:12 |
| hdworak | because my HEAD = remote HEAD | 16:12 |
| paulproteus | Oh, I see. | 16:12 |
| paulproteus | That's mostly true, except I might commit something I want you to see. | 16:12 |
| paulproteus | But I can work in a separate branch and then email/tell you on IRC when you need to look. | 16:13 |
| hdworak | ok, I see | 16:13 |
| hdworak | but my first question here was related to garbage that one might leave during working on something | 16:13 |
| paulproteus | So I agree, no need for you to pull code from the repository. | 16:13 |
| hdworak | like *~ files or something | 16:13 |
| paulproteus | *~ you should put in .gitignore | 16:13 |
| paulproteus | So that they don't show up in "git status" and you never commit them. | 16:14 |
| hdworak | ah, ok | 16:14 |
| paulproteus | You might want to look at .gitignore in git://code.creativecommons.org/herder.git . | 16:14 |
| paulproteus | Also a Pylons project (my current project). | 16:14 |
| hdworak | with genshi? | 16:14 |
| paulproteus | Nope, with Mako for templates (for now). | 16:15 |
| *** Ducky has quit IRC | 16:15 | |
| paulproteus | I'm planning on having you learn Genshi and me contributing to your code to see how I could move to Genshi. (-: | 16:15 |
| isforinsects | mako=awesome | 16:15 |
| paulproteus | isforinsects, Er, not the person, the templating engine. | 16:15 |
| isforinsects | heh | 16:15 |
| isforinsects | Still. | 16:15 |
| *** Sam__ has joined #cc | 16:15 | |
| paulproteus | Really, 'cause I don't really like it. | 16:15 |
| paulproteus | But the guy's not bad. | 16:15 |
| hdworak | ok, but when it comes to Genshi | 16:16 |
| hdworak | are you (=cc) using that already on your Web pages? | 16:16 |
| paulproteus | Nope. | 16:16 |
| paulproteus | Nor Mako. | 16:16 |
| hdworak | ah, so I'm a test subject | 16:16 |
| hdworak | :D | 16:16 |
| paulproteus | (-: | 16:16 |
| hdworak | n/p | 16:16 |
| hdworak | Genshi looks pretty hot in comparison to Smarty | 16:16 |
| hdworak | 'cause it's an XML application | 16:17 |
| paulproteus | Yes. http://www.smarty.net/crashcourse.php makes me cringe. | 16:17 |
| paulproteus | The DEMO involves them misusing "&"! | 16:17 |
| * paulproteus shakes his head. | 16:17 | |
| hdworak | what for? | 16:17 |
| hdworak | argument separator? | 16:18 |
| paulproteus | No, I mean, the first example shows that it's not properly escaped by default. | 16:18 |
| paulproteus | So they have to manually escape it, as showed in the next one. | 16:18 |
| paulproteus | Anyway, yes, I like the idea of Genshi. (-: | 16:18 |
| hdworak | ok, I see your point | 16:19 |
| hdworak | but then again, they don't even put a DOCTYPE | 16:19 |
| hdworak | so it's not valid regardless whether it's the first or the second example | 16:19 |
| paulproteus | Hah. | 16:19 |
| paulproteus | So let's stop talking about PHP, it'll just raise my blood pressure. (-; | 16:20 |
| hdworak | not to mention inline elements directly in the body | 16:20 |
| hdworak | and no encoding information | 16:20 |
| hdworak | ok.. | 16:20 |
| *** Sam__ is now known as ThatGuySam | 16:20 | |
| hdworak | http://www.imagesduo.com/uploads/264800Pg3y3DDUd1zYYzoknvPmsKatow5GJDd.png | 16:25 |
| hdworak | is the directory structure on the left acceptable to work with or I've mixed too many things? | 16:25 |
| paulproteus | Where did "refs" and "hooks" come from? | 16:27 |
| paulproteus | They should be *in* .git! | 16:27 |
| paulproteus | Did you move them out? | 16:27 |
| hdworak | it's after eclipse+pydev project AND paster AND git ? | 16:27 |
| hdworak | no, I haven't done anything with that | 16:27 |
| hdworak | but maybe I'll just pull the master now | 16:28 |
| hdworak | ? | 16:28 |
| hdworak | in a separate directory | 16:28 |
| paulproteus | Oh, weird. | 16:28 |
| paulproteus | I'm not sure, maybe eclipse+pydev moved them out. | 16:28 |
| hdworak | http://code.creativecommons.org/viewgit?p=validator.git;a=tree;h=0b5b2dc4e88db575ef031d6972a6794813f4b835;hb=0b5b2dc4e88db575ef031d6972a6794813f4b835 | 16:28 |
| hdworak | oops, it seems hooks were commited | 16:28 |
| paulproteus | How silly, but no matter, just remove them in a later revision. | 16:29 |
| hdworak | remove or move to .git? | 16:30 |
| paulproteus | Remove them and tell git you're doing so. | 16:30 |
| paulproteus | git rm hooks/* # should do it | 16:30 |
| hdworak | what about the other stuff like "branches", objects ? | 16:30 |
| paulproteus | Are there files in there? | 16:30 |
| paulproteus | If they're empty directories it doesn't matter. | 16:31 |
| hdworak | hooks has stuff | 16:31 |
| paulproteus | Remove the contents, you don't need them. | 16:32 |
| hdworak | objects two empty folders: info, pack | 16:32 |
| paulproteus | Same thing, you can remove them. | 16:32 |
| hdworak | refs: two empty heads, tags | 16:32 |
| paulproteus | Same thing, you can remove them. | 16:32 |
| hdworak | ok | 16:35 |
| hdworak | I'm gonna do that one more time | 16:35 |
| *** mihaih has joined #cc | 16:37 | |
| hdworak | 1. pydev 2. paster 3. git | 16:41 |
| hdworak | and btw - do you have any coding standards that you follow when it comes to the code? | 16:41 |
| hdworak | like spaces instead of tabs? 4 spaces or something? | 16:41 |
| paulproteus | 4 spaces, no tabs | 16:41 |
| *** hdworak has quit IRC | 16:53 | |
| *** greg-g has quit IRC | 17:01 | |
| *** Yaco has quit IRC | 17:02 | |
| *** jgay has quit IRC | 17:11 | |
| *** pmiller has joined #cc | 17:11 | |
| *** hdworak has joined #cc | 17:19 | |
| hdworak | ok | 17:23 |
| hdworak | http://code.creativecommons.org/viewgit?p=validator.git;a=tree;h=refs/heads/sandbox;hb=sandbox | 17:24 |
| hdworak | now it's pydev+paster w/o git garbage | 17:24 |
| *** ThatGuySam has quit IRC | 17:24 | |
| *** mrgarin_ has quit IRC | 17:24 | |
| *** Sam__ has joined #cc | 17:24 | |
| *** Sam__ is now known as ThatGuySam | 17:25 | |
| * hdworak is signing off | 17:27 | |
| hdworak | bye! | 17:27 |
| *** hdworak has quit IRC | 17:27 | |
| *** ThatGuySam is now known as Ducky | 17:54 | |
| *** jonsson has joined #cc | 17:55 | |
| *** jonsson_ has quit IRC | 17:57 | |
| *** nathany has quit IRC | 18:12 | |
| *** mihaih has quit IRC | 18:22 | |
| *** Ducky has quit IRC | 18:37 | |
| *** ajbrooks has quit IRC | 18:55 | |
| *** jonsson has quit IRC | 19:14 | |
| *** jonsson has joined #cc | 19:15 | |
| *** jonsson_ has joined #cc | 19:27 | |
| *** jonsson has quit IRC | 19:36 | |
| *** stevel has quit IRC | 19:52 | |
| *** nkinkade has left #cc | 20:03 | |
| *** coskund has joined #cc | 20:13 | |
| coskund | hii | 20:14 |
| coskund | pls cc | 20:14 |
| *** greg-g has joined #cc | 20:34 | |
| *** greg-g has quit IRC | 21:13 | |
| *** greg-g has joined #cc | 21:15 | |
| *** stevel has joined #cc | 21:44 | |
| *** greg-g has quit IRC | 21:56 | |
| *** luisv has joined #cc | 22:03 | |
| *** rejon has joined #cc | 22:16 | |
| *** pmiller has quit IRC | 23:06 | |
| *** stevel has quit IRC | 23:18 | |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!
