/irc-logs / w3c / #webapps / 2013-05-30 / end

Options:

  1. # Session Start: Thu May 30 00:00:01 2013
  2. # Session Ident: #webapps
  3. # [00:05] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
  4. # [00:12] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
  5. # [00:13] * Quits: tobie (tobie@public.cloak) (Client closed connection)
  6. # [00:17] * Joins: tobie (tobie@public.cloak)
  7. # [00:29] * Joins: kochi_ (~kochi_home@public.cloak)
  8. # [00:36] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
  9. # [00:45] * heycam|away is now known as heycam
  10. # [00:59] * Joins: kochi_ (~kochi_home@public.cloak)
  11. # [01:06] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
  12. # [01:08] * Quits: marcosc (~marcosc@public.cloak) (Client closed connection)
  13. # [01:09] * Joins: marcosc (~marcosc@public.cloak)
  14. # [01:16] * Quits: marcosc (~marcosc@public.cloak) (Ping timeout: 180 seconds)
  15. # [01:25] * Joins: glenn (~gadams@public.cloak)
  16. # [01:27] * Quits: tobie (tobie@public.cloak)
  17. # [01:40] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
  18. # [01:48] * Joins: glenn (~gadams@public.cloak)
  19. # [01:51] * Quits: smaug (~chatzilla@public.cloak) (Ping timeout: 180 seconds)
  20. # [02:17] * Joins: kochi_ (~kochi_home@public.cloak)
  21. # [02:20] * Quits: sicking (~sicking@public.cloak) (sicking)
  22. # [02:25] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
  23. # [02:28] * Joins: tantek_ (~tpod@public.cloak)
  24. # [02:28] * Quits: tantek_ (~tpod@public.cloak) ("Colloquy for iPod touch - http://colloquy.mobi")
  25. # [02:42] * Quits: ArtB (~abarsto@public.cloak) ("Leaving.")
  26. # [03:17] * Quits: tantek (~tantek@public.cloak) (tantek)
  27. # [04:23] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
  28. # [04:54] * Joins: glenn (~gadams@public.cloak)
  29. # [05:15] * heycam is now known as heycam|away
  30. # [05:17] * Joins: sicking (~sicking@public.cloak)
  31. # [05:36] * Joins: richt (~richt@public.cloak)
  32. # [05:36] * Joins: richt_ (~richt@public.cloak)
  33. # [05:36] * Quits: sicking (~sicking@public.cloak) (sicking)
  34. # [05:38] * Joins: tantek (~tantek@public.cloak)
  35. # [05:39] * Quits: tantek (~tantek@public.cloak) (tantek)
  36. # [05:43] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
  37. # [06:02] * heycam|away is now known as heycam
  38. # [06:04] * Joins: tantek (~tantek@public.cloak)
  39. # [06:30] * Quits: yoichio (~yoichio@public.cloak) ("Leaving...")
  40. # [06:35] * Quits: jeffh (~18047aad@public.cloak) ("http://www.mibbit.com ajax IRC Client")
  41. # [07:21] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
  42. # [07:37] * Joins: richt (~richt@public.cloak)
  43. # [07:43] * Quits: richt_ (~richt@public.cloak) (Ping timeout: 180 seconds)
  44. # [07:44] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
  45. # [08:01] * Joins: richt (~richt@public.cloak)
  46. # [08:31] * Joins: jungkees_ (~jungkees@public.cloak)
  47. # [08:31] * Quits: jungkees (~jungkees@public.cloak) ("Page closed")
  48. # [08:32] * Quits: jungkees_ (~jungkees@public.cloak) ("Page closed")
  49. # [08:38] * Joins: Ms2ger (~Ms2ger@public.cloak)
  50. # [08:56] * Joins: spoussa (~Adium@public.cloak)
  51. # [08:56] * Joins: tobie (tobie@public.cloak)
  52. # [08:56] * Parts: spoussa (~Adium@public.cloak) (spoussa)
  53. # [09:52] * Joins: dom (dom@public.cloak)
  54. # [09:56] * Joins: darobin (rberjon@public.cloak)
  55. # [10:02] * Joins: smaug (~chatzilla@public.cloak)
  56. # [10:16] * Joins: marcosc (~marcosc@public.cloak)
  57. # [10:54] * Joins: jungkees (~jungkees@public.cloak)
  58. # [11:36] * heycam is now known as heycam|away
  59. # [11:45] * Quits: smaug (~chatzilla@public.cloak) (Ping timeout: 180 seconds)
  60. # [12:21] * Joins: abarsto (~abarsto@public.cloak)
  61. # [12:21] * abarsto is now known as ArtB
  62. # [12:30] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
  63. # [12:55] * Joins: hallvors (~hallvord@public.cloak)
  64. # [12:58] * Joins: darobin (rberjon@public.cloak)
  65. # [13:17] <hallvors> darobin: good work wrestling httpdie.cnof and the rest of the setup
  66. # [13:20] <darobin> hallvors: thanks :)
  67. # [13:21] <darobin> tell me if it still doesn't work
  68. # [13:21] * Ms2ger wonders how long until it falls over
  69. # [13:22] <jgraham> hallvors: So, I looked at your git problems with the review
  70. # [13:22] <jgraham> I'm not really sure how to fix it
  71. # [13:22] <hallvors> OK - can I start a new branch and cherry-pick the most recent commits, maybe?
  72. # [13:23] <hallvors> so from that branch we could set up a new review and let the old one just complete on those changes?
  73. # [13:23] <jgraham> Well the easiest thing might be to start a new review with a nice linear history and no merges
  74. # [13:23] <hallvors> There's not much work left on the test suite (I hope.. actually spent a month on it..)
  75. # [13:24] <jgraham> You could either do that just for the new commits, or for the whole thing and ask people to copy across their reviews
  76. # [13:25] <hallvors> hm.. here's me and git again :-p I promise to try to avoid merge.. but could I sort of branch off from (well, rebase to) a certain comitt in the existing XHRtestBugFix branch?
  77. # [13:25] <jgraham> Maybe I should have a go at it. Give me a moment
  78. # [13:25] <hallvors> if you do, tell me what commands you used afterwards :)
  79. # [13:26] <hallvors> (the problem with Git is that I think I understand the concepts and all, but Git usually makes it clear that I don't *really*..)
  80. # [13:34] * Quits: marcosc (~marcosc@public.cloak) (Client closed connection)
  81. # [13:54] <jgraham> hallvors: I think I am perhaps getting the merge conflicts wrong here :)
  82. # [13:54] <jgraham> hallvors: But I can tell you what I did
  83. # [13:55] <jgraham> In a clone of w3c/web-platform-tests I set it up to fetch the pull request refs
  84. # [13:55] <jgraham> git config --add remote.origin.fetch '+refs/pull/*/head:refs/remotes/origin/pr/*'
  85. # [13:55] <jgraham> Then I checked out your pr
  86. # [13:56] <jgraham> git checkout -b pr-103 origin/pr/103
  87. # [13:56] <jgraham> Then I interactively rebased the whole thing on master
  88. # [13:56] <jgraham> git rebase -i origin/master
  89. # [13:56] <jgraham> (need a git fetch somewhere in there before you try to check out the branch)
  90. # [13:57] <jgraham> Then just pick all the commits (the default)
  91. # [13:57] <jgraham> Then it will try and rewrite them into a linear sequence of commits
  92. # [13:57] <jgraham> Sometimes there can be conflicts
  93. # [13:57] <jgraham> Which you resolve in the usual way
  94. # [13:57] <jgraham> And then git rebase --continue
  95. # [13:58] <jgraham> It might also say that a commit is empty
  96. # [13:58] <jgraham> git rebase --continue also helps here
  97. # [13:58] <jgraham> The key thing you know that I don't is the correct resolution of the conflicts :)
  98. # [13:58] * Quits: lgombos (~gombos@public.cloak) (Client closed connection)
  99. # [13:58] * Joins: lgombos_ (~gombos@public.cloak)
  100. # [14:02] * Quits: chaals (~Adium@public.cloak) ("Leaving.")
  101. # [14:06] * Quits: lgombos_ (~gombos@public.cloak) (Ping timeout: 180 seconds)
  102. # [14:14] <hallvors> jgraham: thanks! I'll try something like that..
  103. # [14:22] * Joins: marcosc (~marcosc@public.cloak)
  104. # [14:36] * Joins: richt_ (~richt@public.cloak)
  105. # [14:42] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
  106. # [14:46] * Joins: richt (~richt@public.cloak)
  107. # [14:46] * Joins: davidb (~davidb@public.cloak)
  108. # [14:48] * Joins: richt__ (~richt@public.cloak)
  109. # [14:49] * Quits: richt_ (~richt@public.cloak) (Client closed connection)
  110. # [14:54] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
  111. # [15:02] * Quits: dom (dom@public.cloak) ("")
  112. # [15:02] * Joins: dom (dom@public.cloak)
  113. # [15:05] <hallvors> git checkout -b pr-103 origin/pr/103 gives me an error: "fatal: git checkout: updating paths is incompatible with switching branches."
  114. # [15:05] * Joins: richt (~richt@public.cloak)
  115. # [15:06] <Ms2ger> Sounds like git, too
  116. # [15:07] <darobin> hallvors: are you trying to start tracking a remote branch by creating a new branch?
  117. # [15:07] <hallvors> ah.. git fetch first helped
  118. # [15:07] <darobin> how about git branch --track pr-103 origin/pr/103 ?
  119. # [15:11] * Quits: richt__ (~richt@public.cloak) (Ping timeout: 180 seconds)
  120. # [15:12] * Quits: richt (~richt@public.cloak) (Ping timeout: 180 seconds)
  121. # [15:30] * Joins: fjh (~fhirsch3@public.cloak)
  122. # [15:33] * Joins: glenn (~gadams@public.cloak)
  123. # [15:35] * Joins: glenn_ (~gadams@public.cloak)
  124. # [15:36] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
  125. # [15:37] * Joins: lgombos (~gombos@public.cloak)
  126. # [15:39] <hallvors> sigh.. this interactive rebase thing is strange. Almost every change I've made from a certain point seems to be considered a "conflict" and needs much interaction
  127. # [15:41] <jgraham> darobin: You don't need --track there
  128. # [15:41] * Quits: lgombos (~gombos@public.cloak) ("Leaving")
  129. # [15:41] <jgraham> hallvors: Well the problem is that the history on your branch is weird :)
  130. # [15:42] <hallvors> forgive me, Git, for I knew not what I was doing
  131. # [15:42] <jgraham> Or rather, git checkout -b automatically sets up tracking
  132. # [15:43] <darobin> I think both do exactly the same thing :)
  133. # [15:44] <jgraham> Not quite
  134. # [15:44] <jgraham> They both create branches
  135. # [15:45] <jgraham> git branch doesn't check out the branch though
  136. # [15:45] <darobin> ah, good point
  137. # [15:46] <darobin> how that talk of git is sweet to the man who is running a massive CVS operation in the other window
  138. # [15:48] <jgraham> rm -rf cvs/ I hope
  139. # [15:51] * Joins: jeffh (~d871a880@public.cloak)
  140. # [16:16] <hallvors> will the history be OK when I'm done with these weird git gymnastics?
  141. # [16:17] <hallvors> (history rewriting reminds me of http://www.5080.no/2013/03/historiker-mener-historien-om-at-historien-ma-skrives-om-ma-skrives-om/ - but that's mostly for Norwegian readers I guess, not sure how well it translates..)
  142. # [16:18] <jgraham> hallvors: A better question is "will your patch be OK?" :)
  143. # [16:18] <darobin> jgraham: I wish
  144. # [16:18] <jgraham> But yes, I think this should give you the right history
  145. # [16:18] <darobin> this morning TimBL mentioned he would ask the systeam about moving all of w3.org to git
  146. # [16:18] <darobin> that would be sweet
  147. # [16:18] * hallvors would be crossing fingers if it were compatible with typing
  148. # [16:20] * Joins: kochi_ (~kochi_home@public.cloak)
  149. # [16:39] <hallvors> Successfully rebased and updated refs/heads/pr-103.
  150. # [16:39] <hallvors> says Git
  151. # [16:39] <hallvors> winning?
  152. # [16:40] <Ms2ger> Or losing
  153. # [16:40] <Ms2ger> You never know with git
  154. # [16:40] <hallvors> next step? Git push??
  155. # [16:42] <hallvors> jgraham: helpme ^
  156. # [16:42] <jgraham> hallvors: I suggest pushing as a new branch somewhere
  157. # [16:43] <jgraham> Then creating a new PR in the git UI
  158. # [16:43] <hallvors> sure - I can do that. Especially if you tell me how :-p
  159. # [16:43] <jgraham> :)
  160. # [16:43] <jgraham> Well
  161. # [16:43] <jgraham> git checkout -b branch_name
  162. # [16:44] <jgraham> git push origin branch_name:hallvors/remote_branch_name
  163. # [16:44] <jgraham> Would work
  164. # [16:45] <jgraham> Then create a PR in the gh ui
  165. # [16:49] <hallvors> https://github.com/w3c/web-platform-tests/pull/128
  166. # [16:50] <jgraham> https://critic.hoppipolla.co.uk/r/134
  167. # [16:52] <hallvors> why does Critic create the "Custom filters:" section when I add a reviewer?
  168. # [16:53] <jgraham> Because you created a custom filter for that review, I guess
  169. # [16:54] <hallvors> not intentionally
  170. # [16:54] <hallvors> ah - it's reviews /
  171. # [16:54] <jgraham> Quite intentionally, although you might not have thought of it that way
  172. # [16:54] <hallvors> I thought it was reviews/
  173. # [16:54] <jgraham> Yeah
  174. # [16:54] <hallvors> and was a bit confused because there is no reviews/ path anywhere
  175. # [16:55] <hallvors> OK, now it makes sense
  176. # [16:56] * wseltzer is now known as wseltzer-meeting
  177. # [17:01] * Quits: Ms2ger (~Ms2ger@public.cloak) (Ping timeout: 180 seconds)
  178. # [17:06] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
  179. # [17:07] * Quits: kochi_ (~kochi_home@public.cloak) (Client closed connection)
  180. # [17:09] * Joins: kochi_ (~kochi_home@public.cloak)
  181. # [17:16] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
  182. # [17:18] * Joins: smaug (~chatzilla@public.cloak)
  183. # [17:33] * Joins: jsbell (~jsbell@public.cloak)
  184. # [17:38] * Joins: kochi_ (~kochi_home@public.cloak)
  185. # [17:49] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
  186. # [17:49] * Quits: hallvors (~hallvord@public.cloak) (Ping timeout: 180 seconds)
  187. # [17:54] * Joins: kochi_ (~kochi_home@public.cloak)
  188. # [17:56] * Quits: kochi_ (~kochi_home@public.cloak) (Client closed connection)
  189. # [18:10] * Joins: tantek_ (~tpod@public.cloak)
  190. # [18:21] * Quits: tantek_ (~tpod@public.cloak) ("Colloquy for iPod touch - http://colloquy.mobi")
  191. # [18:32] * Quits: dom (dom@public.cloak) ("")
  192. # [18:38] * Joins: kochi_ (~kochi_home@public.cloak)
  193. # [18:42] * Joins: darobin (rberjon@public.cloak)
  194. # [18:44] * Joins: sicking (~sicking@public.cloak)
  195. # [18:45] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
  196. # [18:57] * Joins: Ms2ger (~Ms2ger@public.cloak)
  197. # [19:00] * Quits: marcosc (~marcosc@public.cloak) (Client closed connection)
  198. # [19:01] * Quits: jeffh (~d871a880@public.cloak) ("http://www.mibbit.com ajax IRC Client")
  199. # [19:06] * Joins: jeffh (~d871a880@public.cloak)
  200. # [19:06] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
  201. # [19:07] * Joins: darobin (rberjon@public.cloak)
  202. # [19:10] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
  203. # [19:29] * Quits: tantek (~tantek@public.cloak) (tantek)
  204. # [19:48] * Quits: sicking (~sicking@public.cloak) (sicking)
  205. # [19:51] * Quits: glenn_ (~gadams@public.cloak) (Client closed connection)
  206. # [19:57] * Joins: sicking (~sicking@public.cloak)
  207. # [20:08] * Quits: Ms2ger (~Ms2ger@public.cloak) (Ping timeout: 180 seconds)
  208. # [20:09] * Joins: kochi_ (~kochi_home@public.cloak)
  209. # [20:15] * Joins: chaals (~Adium@public.cloak)
  210. # [20:16] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
  211. # [20:21] * Joins: Ms2ger (~Ms2ger@public.cloak)
  212. # [20:31] * Joins: tantek (~tantek@public.cloak)
  213. # [21:00] * Quits: ArtB (~abarsto@public.cloak) ("Leaving.")
  214. # [21:11] * Joins: glenn (~gadams@public.cloak)
  215. # [21:12] * Joins: glenn_ (~gadams@public.cloak)
  216. # [21:12] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
  217. # [21:17] * Quits: sicking (~sicking@public.cloak) (sicking)
  218. # [21:19] * Quits: fjh (~fhirsch3@public.cloak) (fjh)
  219. # [21:40] * Joins: kochi_ (~kochi_home@public.cloak)
  220. # [21:41] * Quits: tantek (~tantek@public.cloak) (tantek)
  221. # [21:47] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
  222. # [22:00] * Joins: sicking (~sicking@public.cloak)
  223. # [22:11] * Quits: sicking (~sicking@public.cloak) (sicking)
  224. # [22:24] * Quits: chaals (~Adium@public.cloak) ("Leaving.")
  225. # [22:33] * Quits: Ms2ger (~Ms2ger@public.cloak) ("nn")
  226. # [22:39] * Quits: davidb (~davidb@public.cloak) (davidb)
  227. # [22:40] * Joins: kochi_ (~kochi_home@public.cloak)
  228. # [22:48] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
  229. # [22:59] * Quits: jeffh (~d871a880@public.cloak) ("http://www.mibbit.com ajax IRC Client")
  230. # [23:11] * Joins: kochi_ (~kochi_home@public.cloak)
  231. # [23:11] * Joins: jeffh (~d871a880@public.cloak)
  232. # [23:18] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
  233. # [23:34] * Quits: tobie (tobie@public.cloak)
  234. # [23:41] * Joins: kochi_ (~kochi_home@public.cloak)
  235. # [23:49] * Quits: kochi_ (~kochi_home@public.cloak) (Ping timeout: 180 seconds)
  236. # Session Close: Fri May 31 00:00:01 2013

The end :)