Thursday, 13 December 2012< ^ >
arjan has set the subject to: Zotonic - the Erlang Content Management Framework
Room Configuration

[08:19:31] Arjan joins the room
[08:30:11] Arjan leaves the room
[08:38:09] Arjan joins the room
[09:21:39] Andreas Stenius joins the room
[09:24:05] <Andreas Stenius> so it took 21 commands at the prompt to do it (not counting pull's and push'es)... :p
[09:34:29] <Arjan> at least
[09:34:33] <Arjan> :P
[09:34:47] <Arjan> as I said, it was a learning experience :p
[09:36:26] <Andreas Stenius> yeah, and I like git for being quite logical and flexible with what it does.. I always felt like going down a one way street with mercurial...
[09:44:08] Arjan leaves the room
[09:53:31] Arjan joins the room
[10:03:10] maas.maarten.zeeman joins the room
[10:19:21] Arjan leaves the room
[10:23:40] Arjan joins the room
[10:32:07] Arjan leaves the room
[10:36:54] Andreas Stenius leaves the room
[10:42:16] Andreas Stenius joins the room
[11:20:49] <maas.maarten.zeeman> At work we use mercurial, so I sometimes mix up commands
[11:21:05] <maas.maarten.zeeman> hg pull is something different as git pull
[11:21:41] <Andreas Stenius> I still use mercurial on some work related projects where we've not yet made the switch... but I prefer to use the gui for mercurial... that way I avoid those kinds of mistakes :p
[11:22:20] <Andreas Stenius> never really got around to learn the cmd line version of hg...
[11:22:41] <Andreas Stenius> but for git I prefer the command line.. funny thing, that ;)
[11:23:34] <maas.maarten.zeeman> That's what I learned first. Pretty logical api
[11:23:59] <maas.maarten.zeeman> git has a lot of those magic options.
[11:25:42] <maas.maarten.zeeman> needs an option for committing all changes, stuff like that. I still don't know the git equivalent of hg pull; hg update
[11:26:06] <maas.maarten.zeeman> is that fetch and rebase?
[11:26:22] <Andreas Stenius> let me think...
[11:26:49] <Andreas Stenius> first, I'd like to comment on git needing a switch to commit all changes...
[11:27:03] <Andreas Stenius> that is if you haven't staged anything for commit
[11:27:10] <Andreas Stenius> but if you first run git add -u
[11:27:16] <Andreas Stenius> then git commit -m 'foo'
[11:27:31] <maas.maarten.zeeman> what is that -u?
[11:27:34] <Andreas Stenius> it will commit all changes, without extra switches (ok, that was given to add, but still)
[11:27:49] <Andreas Stenius> add all changes made to files already under version control
[11:27:53] <Andreas Stenius> updates
[11:28:01] <Andreas Stenius> i.e. all updated files
[11:28:05] <maas.maarten.zeeman> i guess i need a jquery for dvcs ;-)
[11:28:21] <Andreas Stenius> jquery for dvcs?
[11:28:44] <maas.maarten.zeeman> a simple api for the mundane stuff like committing and such
[11:29:10] <maas.maarten.zeeman> which looks at what the current dvcs is. git, hg
[11:29:12] <Andreas Stenius> have you read http://git-scm.com/book
[11:29:26] <Andreas Stenius> it's a good reference, and avaialbe online
[11:29:41] <maas.maarten.zeeman> Have it on my kindle. :-)
[11:29:52] <Andreas Stenius> it's worth a read :)
[11:30:01] <Andreas Stenius> now, then. hg pull vs git pull
[11:30:19] <maas.maarten.zeeman> Need to find the time i guess.
[11:30:20] <Andreas Stenius> hg pull is like git fetch, as you hinted
[11:30:24] <Andreas Stenius> yep
[11:30:39] <Andreas Stenius> almost
[11:30:59] <maas.maarten.zeeman> it is the almost which worries me :-)
[11:31:21] <Andreas Stenius> the almost is more because I'm not entirely sure what hg pull does
[11:31:47] <Andreas Stenius> that comes from my not understanding the nitty gritty that makes up hg branches
[11:31:51] <Andreas Stenius> and stuff
[11:31:54] <maas.maarten.zeeman> get the changes from a remote and leave the state of your current working directory as is.
[11:32:00] <Andreas Stenius> hg is more like a black box of magick, imho
[11:32:11] <Andreas Stenius> well, in that sense hg pull == git fetch
[11:33:02] <maas.maarten.zeeman> There was a cheat sheet somewhere.
[11:33:11] <Andreas Stenius> then git pull can update your working branch, but it won't rebase unless you ask it to.
[11:34:17] <maas.maarten.zeeman> https://github.com/sympy/sympy/wiki/Git-hg-rosetta-stone/eb04a48a4830c1cb71fd04a56e8aaf8b4517329c
[11:34:42] <maas.maarten.zeeman> but hg update is not mentioned.
[11:35:23] <Andreas Stenius> was a bit hard to get a picture of all that...
[11:35:38] <maas.maarten.zeeman> maybe there is no equivalent for that.
[11:35:41] <Andreas Stenius> the pro git book has reallly good illustrative pictures
[11:35:53] <maas.maarten.zeeman> I need to read it.
[11:36:20] <Andreas Stenius> hg update, doesn't that simply point you to the latest (or some other) revision on a branch... ?
[11:36:44] Arjan joins the room
[11:36:45] <Andreas Stenius> that sounds like git checkout
[11:36:56] <maas.maarten.zeeman> well it will perform a simple merge.
[11:37:15] <maas.maarten.zeeman> so it will work if there aren't any conflicts with the changes in your local branch
[11:37:22] <maas.maarten.zeeman> the usual case
[11:37:53] <Andreas Stenius> and that is more like git pull, then.
[11:38:18] <Arjan> does any of you have issues starting mod_survey in a site?
[11:38:18] <Andreas Stenius> which also does merging if needed.
[11:38:19] <maas.maarten.zeeman> otherwise it will not work and you will have to perform a merge
[11:38:29] <Arjan> I get a timeout related to a category depcache thing
[11:38:33] <Andreas Stenius> I've never tried mod_survey
[11:38:42] <maas.maarten.zeeman> me neither.
[11:38:51] <maas.maarten.zeeman> need to go.
[11:38:56] <Andreas Stenius> ok, cu
[11:40:23] <maas.maarten.zeeman> pick up kids for lunch
[12:48:57] <maas.maarten.zeeman> Funny... https://github.com/joearms/ezwebframe
[12:50:12] <maas.maarten.zeeman> For channel i have something similar
[13:08:11] Arjan leaves the room
[13:21:41] <maas.maarten.zeeman> That new adobe font for coding is really nice. https://blogs.adobe.com/typblography/2012/09/source-code-pro.html
[13:32:15] <Andreas Stenius> yeah, thanks for that. looks nice indeed :)
[13:37:27] <Andreas Stenius> just switched font from courier new in the hex editor I'm currently working in... *aahh...* :)
[13:37:46] <maas.maarten.zeeman> :-)
[14:29:42] <maas.maarten.zeeman> Hex editor, that has been a while. Did you know ST2 has one built in?
[14:31:31] <Andreas Stenius> no... but I'm guessing it's not as fancy as the one I'm using now...
[14:36:24] <maas.maarten.zeeman> emacs?
[14:36:31] <Andreas Stenius> just to give you an idea: https://www.dropbox.com/s/n2727wz4hywuvrz/HexEditor.png
[14:36:42] <Andreas Stenius> nope... that's one is too basic as well...
[14:36:54] <Andreas Stenius> I have templates and scripts to tweak an work with my data...
[14:37:03] <Andreas Stenius> it's quite handy actually...
[14:37:17] <Andreas Stenius> I can paste my c structs into a template file and voile, it's parsed :)
[14:37:29] <Andreas Stenius> voila*
[14:37:42] <maas.maarten.zeeman> cool
[14:37:50] <Andreas Stenius> it has tooltips in the data too (as you can see in the shoot)
[14:38:22] <maas.maarten.zeeman> fancy debugging
[14:38:27] <Andreas Stenius> and from the template, I can parse out extra info, as is seen in the value folumn in the table beneath the data
[14:38:30] <Andreas Stenius> yep
[14:38:54] <Andreas Stenius> and I can tweak the values in the table, and it updates the correct bytes in the file... :)
[14:39:10] <Andreas Stenius> even the date! ;)
[14:41:46] <maas.maarten.zeeman> That is really useful. Boy indeed, that is fancy.
[14:42:21] <Andreas Stenius> just writing a script to export some debug data from that pic... result looks like this:
12/12/2012 07:35:18 X -0.750G 1951ms; Y 0.000G 0ms; Z 0.000G 0ms
[14:48:37] <maas.maarten.zeeman> Looks nice with the font.
[15:02:54] maas.maarten.zeeman leaves the room
[16:14:03] aRyo joins the room
[16:14:31] aRyo leaves the room
[17:24:35] Andreas Stenius leaves the room
[17:27:58] Andreas Stenius joins the room
[18:09:23] maas.maarten.zeeman joins the room
[19:06:11] Arjan joins the room
[19:53:40] maas.maarten.zeeman leaves the room
[22:29:00] <Andreas Stenius> night ppl ;)
[22:29:07] Andreas Stenius leaves the room
[22:32:44] <Arjan> ltrs
[22:32:54] <Arjan> still preparing erlang talk for tomorrow
[22:32:55] <Arjan> :)
Powered by ejabberd Powered by Erlang Valid XHTML 1.0 Transitional Valid CSS!