/irc-logs / w3c / #webapps / 2013-05-21 / end
Options:
- # Session Start: Tue May 21 00:00:00 2013
- # Session Ident: #webapps
- # [00:38] * Joins: tantek (~tpod@public.cloak)
- # [00:48] * Quits: tantek (~tpod@public.cloak) ("Colloquy for iPod touch - http://colloquy.mobi")
- # [01:32] * Quits: Lachy (~Lachy@public.cloak) ("Bye")
- # [01:46] * Joins: Lachy (~Lachy@public.cloak)
- # [02:01] * Quits: jsbell (~jsbell@public.cloak) ("There's no place like home...")
- # [02:48] * Joins: kochi_ (~kochi_home@public.cloak)
- # [02:55] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
- # [03:07] * heycam|away is now known as heycam
- # [03:10] * Quits: sicking (~sicking@public.cloak) (sicking)
- # [03:24] * Joins: real_wez (~realwez@public.cloak)
- # [03:27] * Quits: real_wez (~realwez@public.cloak) (Client closed connection)
- # [03:46] * Joins: paul___irish (~paul___irish@public.cloak)
- # [03:51] * Quits: ArtB (~abarsto@public.cloak) ("Leaving.")
- # [04:22] * heycam is now known as heycam|away
- # [04:55] * heycam|away is now known as heycam
- # [05:03] * heycam is now known as heycam|away
- # [05:10] * Quits: gavin (~gavin@public.cloak) (Ping timeout: 180 seconds)
- # [05:24] * Joins: gavin (~gavin@public.cloak)
- # [05:33] * Joins: richt (~richt@public.cloak)
- # [06:18] * heycam|away is now known as heycam
- # [06:30] * Joins: marcosc (~marcosc@public.cloak)
- # [06:35] * Quits: marcosc_ (~marcosc@public.cloak) (Ping timeout: 180 seconds)
- # [06:39] * Quits: richt (~richt@public.cloak) (Client closed connection)
- # [06:40] * Joins: richt (~richt@public.cloak)
- # [06:47] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
- # [06:55] * Quits: logbot (~logbot@public.cloak) (Ping timeout: 180 seconds)
- # [06:58] * Joins: logbot (~logbot@public.cloak)
- # [07:02] * Joins: tantek (~tpod@public.cloak)
- # [07:06] * Quits: tantek (~tpod@public.cloak) ("Colloquy for iPod touch - http://colloquy.mobi")
- # [07:31] * Joins: richt (~richt@public.cloak)
- # [07:32] * Joins: richt_ (~richt@public.cloak)
- # [07:38] * Joins: sicking (~sicking@public.cloak)
- # [07:38] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
- # [08:37] * Quits: chaals (~Adium@public.cloak) ("Leaving.")
- # [08:44] * Joins: richt (~richt@public.cloak)
- # [08:45] * Quits: richt_ (~richt@public.cloak) (Ping timeout: 180 seconds)
- # [08:49] * Joins: chaals (~Adium@public.cloak)
- # [08:53] * Quits: timeless (~uid4015@public.cloak) ("Connection closed for inactivity")
- # [09:04] * Joins: richt_ (~richt@public.cloak)
- # [09:10] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
- # [09:16] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
- # [09:29] * Joins: richt (~richt@public.cloak)
- # [09:34] * Quits: logbot (~logbot@public.cloak) (Ping timeout: 180 seconds)
- # [09:36] * Quits: richt_ (~richt@public.cloak) (Ping timeout: 180 seconds)
- # [09:36] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
- # [09:47] * Quits: karl (~karlcow@public.cloak) (Client closed connection)
- # [09:56] * heycam is now known as heycam|away
- # [10:05] * Joins: richt (~richt@public.cloak)
- # [11:01] * Joins: logbot (~logbot@public.cloak)
- # [11:09] * heycam|away is now known as heycam
- # [11:13] * heycam is now known as heycam|away
- # [11:13] * heycam|away is now known as heycam
- # [11:38] * Quits: richt (~richt@public.cloak) (Client closed connection)
- # [11:39] * Joins: richt (~richt@public.cloak)
- # [11:46] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
- # [11:47] * Joins: Jungkee (~Jungkee@public.cloak)
- # [11:50] * Joins: karl (~karlcow@public.cloak)
- # [11:58] * Quits: chaals (~Adium@public.cloak) (Ping timeout: 180 seconds)
- # [12:13] * heycam is now known as heycam|away
- # [12:22] * Quits: gavin (~gavin@public.cloak) (Client closed connection)
- # [12:22] * Quits: kochi (~kochi@public.cloak) (Client closed connection)
- # [12:23] * Joins: gavin (~gavin@public.cloak)
- # [12:41] * Joins: tobie (tobie@public.cloak)
- # [12:48] * Joins: darobin (rberjon@public.cloak)
- # [13:08] * Joins: chaals (~Adium@public.cloak)
- # [13:16] * Joins: richt (~richt@public.cloak)
- # [13:17] * Joins: richt_ (~richt@public.cloak)
- # [13:23] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
- # [13:29] * Joins: abarsto (~abarsto@public.cloak)
- # [13:29] * abarsto is now known as ArtB
- # [13:32] * Joins: smaug (~chatzilla@public.cloak)
- # [14:03] * Joins: hallvors (~hallvord@public.cloak)
- # [14:09] * Quits: sicking (~sicking@public.cloak) (sicking)
- # [14:26] * Joins: chaals1 (~Adium@public.cloak)
- # [14:32] * Quits: chaals (~Adium@public.cloak) (Ping timeout: 180 seconds)
- # [14:33] <Jungkee> Hi Hallvord
- # [14:44] <ArtB> hallvorS (nick ;))
- # [14:45] <hallvors> Hi :) (and thanks Art - the IRC client popped up a notification when you used the right nick)
- # [14:47] * Quits: richt_ (~richt@public.cloak) (Client closed connection)
- # [14:47] * Joins: richt (~richt@public.cloak)
- # [14:55] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
- # [14:58] * Joins: glenn (~gadams@public.cloak)
- # [15:15] * Joins: davidb (~davidb@public.cloak)
- # [15:24] * heycam|away is now known as heycam
- # [15:40] * Joins: Ms2ger (~Ms2ger@public.cloak)
- # [15:50] * Joins: kochi (~kochi_home@public.cloak)
- # [15:54] * Quits: chaals1 (~Adium@public.cloak) (Ping timeout: 180 seconds)
- # [15:57] * Quits: kochi (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
- # [16:00] * Joins: davidb_ (~davidb@public.cloak)
- # [16:06] * Quits: davidb (~davidb@public.cloak) (Ping timeout: 180 seconds)
- # [16:06] * davidb_ is now known as davidb
- # [16:12] * Joins: chaals (~Adium@public.cloak)
- # [16:20] * Joins: kochi (~kochi_home@public.cloak)
- # [16:24] * heycam is now known as heycam|away
- # [16:26] * Joins: kochi_ (~kochi_home@public.cloak)
- # [16:27] * Quits: kochi (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
- # [16:46] * Quits: tobie (tobie@public.cloak)
- # [16:59] * Joins: sicking (~sicking@public.cloak)
- # [17:19] * Quits: kochi_ (~kochi_home@public.cloak) (Client closed connection)
- # [17:20] * Quits: ArtB (~abarsto@public.cloak) ("Leaving.")
- # [17:20] * Joins: kochi (~kochi_home@public.cloak)
- # [17:27] * Quits: kochi (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
- # [17:29] * Quits: chaals (~Adium@public.cloak) ("Leaving.")
- # [17:43] * Joins: abarsto (~abarsto@public.cloak)
- # [17:43] * abarsto is now known as ArtB
- # [17:48] * Joins: timeless (~uid4015@public.cloak)
- # [18:05] * Quits: davidb (~davidb@public.cloak) ("blast off!")
- # [18:05] * Joins: kochi (~kochi_home@public.cloak)
- # [18:16] * Joins: chaals (~Adium@public.cloak)
- # [18:22] * Quits: chaals (~Adium@public.cloak) ("Leaving.")
- # [18:23] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
- # [18:26] * Joins: glenn (~gadams@public.cloak)
- # [18:29] * Quits: Ms2ger (~Ms2ger@public.cloak) (Ping timeout: 180 seconds)
- # [18:31] * Quits: sicking (~sicking@public.cloak) (sicking)
- # [18:40] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
- # [18:40] * Joins: jsbell (~jsbell@public.cloak)
- # [18:41] * Joins: Ms2ger (~Ms2ger@public.cloak)
- # [18:46] * Joins: tantek (~tpod@public.cloak)
- # [18:50] * Joins: sicking (~sicking@public.cloak)
- # [19:03] * Quits: tantek (~tpod@public.cloak) ("Colloquy for iPod touch - http://colloquy.mobi")
- # [19:04] * Joins: tantek (~tpod@public.cloak)
- # [19:12] * Quits: kochi (~kochi_home@public.cloak) (Client closed connection)
- # [19:18] * Joins: kochi (~kochi_home@public.cloak)
- # [19:19] * Joins: richt (~richt@public.cloak)
- # [19:22] * Quits: kochi (~kochi_home@public.cloak) (Client closed connection)
- # [19:31] * Quits: tantek (~tpod@public.cloak) ("Colloquy for iPod touch - http://colloquy.mobi")
- # [19:31] * Quits: sicking (~sicking@public.cloak) (sicking)
- # [19:40] * Joins: tantek (~tpod@public.cloak)
- # [19:50] * Quits: tantek (~tpod@public.cloak) ("Colloquy for iPod touch - http://colloquy.mobi")
- # [19:53] * Joins: kochi (~kochi_home@public.cloak)
- # [20:03] * Joins: sicking (~sicking@public.cloak)
- # [20:03] * Quits: kochi (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
- # [20:16] * Joins: tantek (~tpod@public.cloak)
- # [20:19] * Joins: richt_ (~richt@public.cloak)
- # [20:19] * Quits: richt (~richt@public.cloak) (Client closed connection)
- # [20:24] * Joins: davidb (~davidb@public.cloak)
- # [20:26] * Quits: tantek (~tpod@public.cloak) ("Colloquy for iPod touch - http://colloquy.mobi")
- # [20:27] * Joins: kochi (~kochi_home@public.cloak)
- # [20:27] * Quits: marcosc (~marcosc@public.cloak) (Client closed connection)
- # [20:34] * Quits: kochi (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
- # [20:49] * Joins: tobie (tobie@public.cloak)
- # [21:02] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
- # [21:06] * Quits: richt_ (~richt@public.cloak) (Client closed connection)
- # [21:07] * Joins: richt (~richt@public.cloak)
- # [21:14] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
- # [21:23] * Joins: glenn (~gadams@public.cloak)
- # [21:23] * Quits: sicking (~sicking@public.cloak) (sicking)
- # [21:43] * Joins: chaals (~Adium@public.cloak)
- # [21:46] * Joins: glenn_ (~gadams@public.cloak)
- # [21:46] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
- # [21:50] * Joins: sicking (~sicking@public.cloak)
- # [21:59] * Joins: kochi (~kochi_home@public.cloak)
- # [21:59] * Joins: davidb_ (~davidb@public.cloak)
- # [22:01] <hallvors> Is Robin around - or someone else who can answer a GitHub question?
- # [22:01] <Ms2ger> Try me
- # [22:02] <hallvors> thanks - looking at the "Move MS tests" stuff
- # [22:02] <hallvors> https://github.com/w3c/web-platform-tests/pull/50
- # [22:02] <hallvors> basic stupid question: can I clone the w3c/web-platform-tests directly, merge/edit MS tests, and push back to github?
- # [22:03] <hallvors> or do I need to create a branch in my clone of the web-platform-tests repo, get the MS tests to there and push to my repo first?
- # [22:03] <jgraham> No, you can do that
- # [22:03] <Ms2ger> You can just work on the submission/Microsoft/XHR branch in the w3c repo, I think
- # [22:04] <jgraham> If you are fixing up an exisitng PR, things are a bit tricky
- # [22:04] <hallvors> hm .. :-o
- # [22:04] * Quits: davidb (~davidb@public.cloak) (Ping timeout: 180 seconds)
- # [22:04] * davidb_ is now known as davidb
- # [22:04] <jgraham> Unless there is already an explicit branch for the PR
- # [22:04] <hallvors> "a bit tricky" is a description of my relationship with Git, I'm afraid
- # [22:04] <jgraham> (you can do it either way, but it is just a little more involved if there is no explicit branch)
- # [22:05] * Quits: kochi (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
- # [22:05] <hallvors> often when I think I've understood a concept, Git makes it clear that I haven't..
- # [22:06] <jgraham> Well this is an example of github making things more complicated than they need to be
- # [22:06] <hallvors> well, GitHub says I have to use the command line..
- # [22:06] <hallvors> so if I first check out https://github.com/w3c/web-platform-tests.git
- # [22:07] <hallvors> sorry - clone
- # [22:07] <hallvors> then do git checkout -b submission/Microsoft/XHR origin/submission/Microsoft/XHR
- # [22:07] <hallvors> it should work?
- # [22:07] <jgraham> Yes
- # [22:07] <jgraham> Now the theory:
- # [22:08] <hallvors> OK - now I am (apparently) on the right branch locally
- # [22:08] <jgraham> The fundamental structure used for branches and so on is a "ref" which is basically a file containing the SHA1 of a commit
- # [22:08] <jgraham> These are stored in the refs/ folder in the git directory
- # [22:09] <jgraham> (typicaly .git unless it's a bare repo)
- # [22:09] * hallvors is making notes. .git/refs very important. Git brain stuff.
- # [22:09] <jgraham> So you have things like refs/heads/master which is a pointer to the head of the master branch
- # [22:10] <jgraham> Things under refs/heads are local branches
- # [22:10] <jgraham> things under remotes/ are remote branches
- # [22:10] <hallvors> ok.. now I need a hand.
- # [22:10] <jgraham> e.g. remotes/origin/master
- # [22:10] <hallvors> I said git merge master (what GitHub told me)
- # [22:11] <jgraham> But github does something slightly funky for pull requests
- # [22:11] <hallvors> and it says it's removing lots of files
- # [22:11] <hallvors> - lots of them are not inside the XHR folder
- # [22:11] <hallvors> well, that's probably OK - these are other moved tests I guess
- # [22:12] <jgraham> instead of creating a branch in the repository, it uses refs/pr/ to store pointers to all the heads of the pull requests
- # [22:13] <jgraham> So they don't get synced on pull (because only refs in the remote under refs/heads get synced by default)
- # [22:13] <jgraham> So if you want to check out PRs you need to alter the config a bit
- # [22:13] <jgraham> Which is covered in https://gist.github.com/piscisaureus/3342247
- # [22:14] <hallvors> another stupid question: when git says there are conflicts, what command do I use for seeing WHERE the conflicts are?
- # [22:14] <jgraham> er, sorry, refs/pull/
- # [22:14] <jgraham> hallvors: git status
- # [22:14] <jgraham> It should have a section "both modified"
- # [22:14] <jgraham> listing the files
- # [22:15] <jgraham> If you open those files in a text editor, it should then be possible to resolve the conflict; look for conflict markers like <<<<< ======= >>>>>
- # [22:15] <jgraham> (or possibly the arrows the other way around)
- # [22:15] <jgraham> (other people seem to like merge tools like "meld", but those just confuse me)
- # [22:17] <hallvors> ugh..there are lots of changes, and I can not find any "both modified"
- # [22:17] <hallvors> but it says Untracked files: MANIFEST~HEAD
- # [22:17] <hallvors> how can there be an untracked file in a checkout?
- # [22:17] <jgraham> Hmm, let me try what you are doing :)
- # [22:17] <hallvors> I haven't created any files here AFAIK..
- # [22:18] <jgraham> What did you run after you created the branch?
- # [22:18] * hallvors thinks Ms2ger is using Git kungfu power to confuse my repo
- # [22:18] <hallvors> just the commands in the pull request basically
- # [22:19] * Quits: Ms2ger (~Ms2ger@public.cloak) (Ping timeout: 180 seconds)
- # [22:19] <hallvors> (plus an initial clone command in a new folder - I don't trust my Git branching skills enough..)
- # [22:22] <jgraham> That seems to be a temporary file created as part of the merge
- # [22:23] <jgraham> So git rebase was more informative than git merge
- # [22:23] <jgraham> #html-wg both added: XMLHttpRequest/MANIFEST
- # [22:23] <hallvors> how do I use that rebase command again?
- # [22:24] <hallvors> um, ignore that. I don't want to study rebase right now..
- # [22:25] <jgraham> So, basically what you need to do is solve the conflicts in XMLHttpRequest/MANIFEST
- # [22:26] <jgraham> Which basically means merging the two lists of files
- # [22:26] <jgraham> It isn't hard I don't think
- # [22:26] <hallvors> done
- # [22:26] <hallvors> I think :)
- # [22:27] <hallvors> now git merge master says I'm up to date
- # [22:28] * Joins: kochi (~kochi_home@public.cloak)
- # [22:29] <jgraham> OK, good
- # [22:29] * Joins: shepazutu (schepers@public.cloak)
- # [22:29] <hallvors> now..what do I do about the double readyState=1 event? :-/
- # [22:30] <hallvors> fix the MS tests so they no longer work in IE? :-p
- # [22:30] <jgraham> (I hate merges and think GH has a crazy flowflow here)
- # [22:30] <jgraham> *workflow
- # [22:30] <hallvors> add browser sniffing? :-p :-p
- # [22:31] * Quits: shepazu (schepers@public.cloak) (Ping timeout: 180 seconds)
- # [22:31] * shepazutu is now known as shepazu
- # [22:31] <jgraham> You are responsible to the web, not to Microsoft. Fix the tests so they are right and if that breaks them in some browser, that browser will be motivated to fix their bugs
- # [22:32] * Joins: Ms2ger (~Ms2ger@public.cloak)
- # [22:32] <jgraham> (are you planning to merge the PR first then fix the bugs? Otherwise why did you start with a merge? Not sure how well github will like that)
- # [22:32] <jgraham> (I suppose it might handle it OK)
- # [22:34] * Joins: davidb_ (~davidb@public.cloak)
- # [22:35] * Quits: kochi (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
- # [22:39] * Quits: davidb (~davidb@public.cloak) (Ping timeout: 180 seconds)
- # [22:41] * Quits: davidb_ (~davidb@public.cloak) (Ping timeout: 180 seconds)
- # [22:44] <hallvors> jgraham: I don't really mind either way.. but as I understand it, I'm still working on that branch Ms2ger set up for this PR
- # [22:44] <jgraham> Hmm, well critic sure doesn't like it
- # [22:44] <jgraham> (the merge)
- # [22:44] <hallvors> so fixing bugs there, then use the green button in the PR
- # [22:45] <hallvors> hm.. I see nothing unusual on the review's main page?
- # [22:45] <jgraham> Yeah, that makes sense, but it might have been easier to fix the bugs first and then merge/rebase with master
- # [22:46] <jgraham> since this presumably doesn't depend on any changes in master
- # [22:46] <hallvors> oh well. I admit to following GitHub instructions blindly
- # [22:46] <hallvors> :-p
- # [22:49] <Ms2ger> "An exception was raised while processing the request. A message has been sent to the system administrator(s)."
- # [22:49] <hallvors> jgraham will regret helping me :-p
- # [22:50] <hallvors> hm.. the abort-event-order test asserts opposite order than the spec says
- # [22:50] <hallvors> spec says fire events on main object first, then on upload object. test asserts other way around is correct. Let's guess what IE does.. :-/
- # [22:58] <jgraham> I think I need to fix a critic bug to resurrect your review there
- # [22:58] <jgraham> But it's not going to happen now
- # [22:58] <jgraham> Instead I shall sleep
- # [22:58] <Ms2ger> So shall I
- # [22:58] <Ms2ger> Night, all
- # [22:59] * Quits: Ms2ger (~Ms2ger@public.cloak) ("nn")
- # [22:59] * Joins: kochi (~kochi_home@public.cloak)
- # [23:03] * Quits: tobie (tobie@public.cloak)
- # [23:06] * Quits: kochi (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
- # [23:06] * Quits: smaug (~chatzilla@public.cloak) (Ping timeout: 180 seconds)
- # [23:12] * Quits: karl (~karlcow@public.cloak) (":tiuQ tiuq sah woclrak")
- # [23:23] * Quits: hallvors (~hallvord@public.cloak) (Ping timeout: 180 seconds)
- # [23:29] * Joins: kochi (~kochi_home@public.cloak)
- # [23:36] <timeless> heh
- # [23:36] * Quits: kochi (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
- # Session Close: Wed May 22 00:00:00 2013
The end :)