/irc-logs / w3c / #testing / 2013-10-04 / end

Options:

  1. # Session Start: Fri Oct 04 00:00:00 2013
  2. # Session Ident: #testing
  3. # [00:03] * Quits: tobie (tobie@public.cloak)
  4. # [00:04] * Joins: rhauck1 (~Adium@public.cloak)
  5. # [00:09] * Quits: rhauck (~Adium@public.cloak) (Ping timeout: 180 seconds)
  6. # [00:18] * Joins: jhammel (~jhammel@public.cloak)
  7. # [00:27] * Joins: andreast` (~user@public.cloak)
  8. # [00:34] * Joins: gitbot (~gitbot@public.cloak)
  9. # [00:34] -gitbot:#testing- [web-platform-tests] Velmont created r/hillbrad/newCorsStatusCodes (+1 new commit): https://github.com/w3c/web-platform-tests/commit/d2a10f31b00d
  10. # [00:34] -gitbot:#testing- web-platform-tests/r/hillbrad/newCorsStatusCodes d2a10f3 Brad Hill: Added tests for 308 and 2xx status codes.
  11. # [00:34] * Parts: gitbot (~gitbot@public.cloak) (gitbot)
  12. # [00:35] <odinho> jgraham: I have no idea how to update a pull request with a rebase.
  13. # [00:35] <odinho> Can I push to the critic review? It won't know my ssh key, so I guess not.
  14. # [00:37] * Joins: gitbot (~gitbot@public.cloak)
  15. # [00:37] -gitbot:#testing- [web-platform-tests] Velmont deleted r/hillbrad/newCorsStatusCodes at d2a10f3: https://github.com/w3c/web-platform-tests/commit/d2a10f3
  16. # [00:37] * Parts: gitbot (~gitbot@public.cloak) (gitbot)
  17. # [00:38] * Quits: andreast` (~user@public.cloak) (Client closed connection)
  18. # [00:39] * Joins: gitbot (~gitbot@public.cloak)
  19. # [00:39] -gitbot:#testing- [web-platform-tests] Velmont pushed 1 new commit to master: https://github.com/w3c/web-platform-tests/commit/d2a10f31b00df85aa0a4f8b242785d838f82f788
  20. # [00:39] -gitbot:#testing- web-platform-tests/master d2a10f3 Brad Hill: Added tests for 308 and 2xx status codes.
  21. # [00:39] * Parts: gitbot (~gitbot@public.cloak) (gitbot)
  22. # [00:40] * Joins: gitbot (~gitbot@public.cloak)
  23. # [00:40] -gitbot:#testing- [web-platform-tests] Velmont closed pull request #341: New cors status codes (master...newCorsStatusCodes) https://github.com/w3c/web-platform-tests/pull/341
  24. # [00:40] * Parts: gitbot (~gitbot@public.cloak) (gitbot)
  25. # [00:52] * Quits: rhauck1 (~Adium@public.cloak) ("Leaving.")
  26. # [00:57] * Joins: tobie (tobie@public.cloak)
  27. # [01:05] * Joins: rhauck (~Adium@public.cloak)
  28. # [01:52] * Quits: tobie (tobie@public.cloak)
  29. # [02:33] * Joins: tobie (tobie@public.cloak)
  30. # [03:03] * Quits: tobie (tobie@public.cloak)
  31. # [03:04] * Joins: tobie (tobie@public.cloak)
  32. # [03:10] * Quits: jhammel (~jhammel@public.cloak) (Ping timeout: 180 seconds)
  33. # [04:02] * Quits: ArtB (~abarsto@public.cloak) ("Leaving.")
  34. # [04:16] * Quits: rhauck (~Adium@public.cloak) ("Leaving.")
  35. # [04:16] * Joins: rhauck (~Adium@public.cloak)
  36. # [04:23] * Quits: rhauck (~Adium@public.cloak) (Ping timeout: 180 seconds)
  37. # [05:34] * Joins: gitbot (~gitbot@public.cloak)
  38. # [05:34] -gitbot:#testing- [web-platform-tests] tobie closed pull request #358: Use webidl2.js instead of WebIDLParser.js (master...submission/ayg-use-webidl2) https://github.com/w3c/web-platform-tests/pull/358
  39. # [05:34] * Parts: gitbot (~gitbot@public.cloak) (gitbot)
  40. # [06:16] * Quits: tobie (tobie@public.cloak)
  41. # [06:56] * Quits: Lachy (~Lachy@public.cloak) ("My MacBook Pro has gone to sleep. ZZZzzz…")
  42. # [07:28] * Joins: tobie (tobie@public.cloak)
  43. # [07:43] * Joins: gitbot (~gitbot@public.cloak)
  44. # [07:43] -gitbot:#testing- [web-platform-tests] tobie opened pull request #362: Enhance the coverage tool to allow for groups of specs to be estimated together. (master...coverage-tool-enhancement) https://github.com/w3c/web-platform-tests/pull/362
  45. # [07:43] * Parts: gitbot (~gitbot@public.cloak) (gitbot)
  46. # [07:48] * Quits: tobie (tobie@public.cloak)
  47. # [08:04] * Quits: mdas_ (~mdas@public.cloak) (Client closed connection)
  48. # [08:04] * Joins: mdas (~mdas@public.cloak)
  49. # [08:11] * Quits: mdas (~mdas@public.cloak) (Ping timeout: 180 seconds)
  50. # [08:29] * Joins: mdas (~mdas@public.cloak)
  51. # [08:44] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
  52. # [08:44] * Joins: glenn (~gadams@public.cloak)
  53. # [08:45] * Joins: glenn_ (~gadams@public.cloak)
  54. # [08:45] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
  55. # [08:49] * Joins: dom (dom@public.cloak)
  56. # [08:51] * Quits: glenn_ (~gadams@public.cloak) (Client closed connection)
  57. # [08:51] * Joins: glenn (~gadams@public.cloak)
  58. # [08:59] * Quits: glenn (~gadams@public.cloak) (Ping timeout: 180 seconds)
  59. # [09:08] * Joins: Lachy (~Lachy@public.cloak)
  60. # [09:30] * Joins: zcorpan (~zcorpan@public.cloak)
  61. # [09:46] * Joins: jhammel (~jhammel@public.cloak)
  62. # [09:59] * Joins: Ms2ger (~Ms2ger@public.cloak)
  63. # [09:59] * Quits: Ms2ger (~Ms2ger@public.cloak) ("Leaving")
  64. # [10:00] * Quits: jhammel (~jhammel@public.cloak) (Ping timeout: 180 seconds)
  65. # [10:10] * Quits: Lachy (~Lachy@public.cloak) ("My MacBook Pro has gone to sleep. ZZZzzz…")
  66. # [10:28] <jgraham> odinho: That is a little tricky, yes
  67. # [10:28] <jgraham> push to the PR
  68. # [10:29] <jgraham> Then in critic don't use "Prepare Rebase" like normal, but instead use "Rebase Review" near the top of the review page
  69. # [10:29] <odinho> But I can't push to the PR, now, can I? :)
  70. # [10:29] <odinho> I tried pusing to refs/pull/341/head, but no go. Can't push to those hidden internal refs.
  71. # [10:30] <odinho> And I can't ofc push to bradhill's private fork.
  72. # [10:31] <jgraham> Oh, well yeah, I can't help you with that
  73. # [10:31] <jgraham> github sucks
  74. # [10:34] <jgraham> The model is just broken if one person makes a PR and then others want to collaborate on it
  75. # [10:35] <jgraham> You are probably supposed to start again with their branch and create a new PR or something
  76. # [10:35] <dom> can't you make a pull request on the fork of the first contributor?
  77. # [10:36] <dom> we've done that at least on one PR I was involved with
  78. # [10:36] * Joins: Lachy (~Lachy@public.cloak)
  79. # [10:37] <jgraham> Yeah, that's what I said
  80. # [10:37] <jgraham> But then you lose the first PR
  81. # [10:37] <dom> hmm... I don't think you need to lose it
  82. # [10:37] <dom> if the first contributor merges the PR in their fork, this will update their PR, won't it?
  83. # [10:38] <jgraham> Oh, I see
  84. # [10:38] <jgraham> That's kind of insane though
  85. # [10:38] <dom> well, we're talking about git
  86. # [10:39] <jgraham> But git handles this *really* well
  87. # [10:39] <jgraham> *github* doesn't
  88. # [10:41] <odinho> Yeah. Agree, this is a github irritation.
  89. # [10:42] <odinho> If it had actually allowed us to push updates to the refs/pull/341/* in some way, that might be a way.
  90. # [12:01] * Joins: AutomatedTester (~AutomatedTester@public.cloak)
  91. # [12:04] * Joins: abarsto (~abarsto@public.cloak)
  92. # [12:04] * abarsto is now known as ArtB
  93. # [12:37] * Joins: darobin (rberjon@public.cloak)
  94. # [13:29] * Quits: Lachy (~Lachy@public.cloak) ("Textual IRC Client: www.textualapp.com")
  95. # [13:34] * Joins: glenn (~gadams@public.cloak)
  96. # [13:34] * Joins: Lachy (~Lachy@public.cloak)
  97. # [13:39] * Quits: zcorpan (~zcorpan@public.cloak) (Client closed connection)
  98. # [13:39] * Joins: zcorpan (~zcorpan@public.cloak)
  99. # [13:43] * Quits: AutomatedTester (~AutomatedTester@public.cloak) (Client closed connection)
  100. # [13:46] * Quits: zcorpan (~zcorpan@public.cloak) (Ping timeout: 180 seconds)
  101. # [13:47] * Joins: AutomatedTester (~AutomatedTester@public.cloak)
  102. # [14:04] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
  103. # [14:04] * Joins: glenn (~gadams@public.cloak)
  104. # [14:10] * Joins: zcorpan (~zcorpan@public.cloak)
  105. # [14:11] * Quits: AutomatedTester (~AutomatedTester@public.cloak) (Client closed connection)
  106. # [14:12] * Quits: glenn (~gadams@public.cloak) (Ping timeout: 180 seconds)
  107. # [14:15] * Joins: tobie (tobie@public.cloak)
  108. # [14:20] * Quits: zcorpan (~zcorpan@public.cloak) (Ping timeout: 180 seconds)
  109. # [14:46] * Quits: tobie (tobie@public.cloak)
  110. # [15:13] * heycam|away is now known as heycam
  111. # [15:16] * Joins: tobie (tobie@public.cloak)
  112. # [15:35] <tobie> Hey folks, looking at reverting pr #358 I mistakenly merged. What's the preferred strategy hear? Should I just revert the merge commit with the -m 1 option?
  113. # [15:36] <jgraham> I don't think that there is a great strategy, sadly. Let me remind myself what that does
  114. # [15:38] <tobie> :(
  115. # [15:38] <tobie> s/hear/here/ (just woke up)
  116. # [15:39] <jgraham> Yeah, so that works. But if you merge the branch again in the future things go weird
  117. # [15:39] <jgraham> (you have to revert the revert first)
  118. # [15:39] <tobie> There's only one commit, I could also just revert that one.
  119. # [15:40] <tobie> (if that's preferred)
  120. # [15:49] * heycam is now known as heycam|away
  121. # [15:49] * odinho doesnt' like merges
  122. # [15:50] <andreastt> +1
  123. # [15:52] <tobie> that's very helpful in the current context. :)
  124. # [15:53] <andreastt> I've explicitly tried avoiding the git-merge interface for precisely this this reason. (-:
  125. # [15:53] <andreastt> So my knowledge of how it works isn't great.
  126. # [15:57] <tobie> https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt seems like a good result
  127. # [16:01] <tobie> s/result/resource/ (needs more coffee)
  128. # [16:02] * heycam|away is now known as heycam
  129. # [16:03] * heycam is now known as heycam|away
  130. # [16:12] * Joins: AutomatedTester (~AutomatedTester@public.cloak)
  131. # [16:23] * Quits: AutomatedTester (~AutomatedTester@public.cloak) (Client closed connection)
  132. # [16:27] * Joins: gitbot (~gitbot@public.cloak)
  133. # [16:27] -gitbot:#testing- [web-platform-tests] tobie opened pull request #363: Revert "Merge pull request #358 from ayg/submission/ayg-use-webidl2" (master...revert-pull-request-358) https://github.com/w3c/web-platform-tests/pull/363
  134. # [16:27] * Parts: gitbot (~gitbot@public.cloak) (gitbot)
  135. # [16:40] <jgraham> Yeah, so this is another reason that merges suck and, by proxy, github is unfortunately limiting
  136. # [16:41] <andreastt> Well you can still do patch integrations by rebasing… it just means you have to ignore the shiny green button.
  137. # [16:41] <andreastt> (It can be hard.)
  138. # [16:44] <tobie> ^ not sure I understand the issue, actually.
  139. # [16:45] <tobie> I agree that this is a tad complicated, but it seems to work alright, no?
  140. # [16:46] <andreastt> I'm sure it's a matter of preference. (-:
  141. # [16:46] <tobie> (it's also an edge case for which it seems fair not to optimize)
  142. # [16:46] <andreastt> But in all the projects I've worked on, people have tended to prefer a one-dimensional flat branch history with a patch squash-rebase tactic for integration.
  143. # [16:48] <tobie> oh, that. Yeah. I guess this is generally true of projects that are not GitHub-based.
  144. # [16:48] <andreastt> I guess that tactic pleases the non-git crowd also, which could be the reason.
  145. # [16:48] <tobie> Good point.
  146. # [16:49] <andreastt> (The green button is tempting though!)(
  147. # [16:58] <jgraham> tobie: I think the initial revert is OK
  148. # [16:59] <jgraham> But then if you patch the first branch and try to merge it again, it thinks that the first commits were already merged (because they were), doesn't know that they were reverted, and so only applies the parts of the branch after the revert. Which might not be enough to work correctly
  149. # [17:00] <jgraham> So you have to manually remember that the merge was reverted and then undo the revert before you merge again
  150. # [17:23] <tobie> Yes, which is why I added instruction in the initial PR on how to revert the revert.
  151. # [17:23] <tobie> ^ jgraham
  152. # [17:24] <tobie> Which, when applied should allow the updated PR to be treated as if nothing had ever happened.
  153. # [17:24] <tobie> (fingers crossed)
  154. # [17:24] <jgraham> Yeah, it "works", but it isn't nice
  155. # [17:33] * Joins: AutomatedTester (~AutomatedTester@public.cloak)
  156. # [17:33] <tobie> It's plain ugly, frankly. But as I said above, it's an edge case… OK to be ugly.
  157. # [17:40] * Quits: AutomatedTester (~AutomatedTester@public.cloak) (Ping timeout: 180 seconds)
  158. # [17:47] * Joins: scheib (~uid4467@public.cloak)
  159. # [18:09] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
  160. # [18:16] * Quits: dom (dom@public.cloak) ("")
  161. # [18:18] * Quits: Lachy (~Lachy@public.cloak) ("My MacBook Pro has gone to sleep. ZZZzzz…")
  162. # [18:24] <jgraham> It's not really that much of an edge case to want to revert a change on mainline. It's the second time it happened in web-platform-tests
  163. # [18:24] <jgraham> But there's no better solution that I know of so there we go
  164. # [18:27] * Joins: glenn (~gadams@public.cloak)
  165. # [18:32] * Joins: glenn_ (~gadams@public.cloak)
  166. # [18:32] * Quits: glenn (~gadams@public.cloak) (Client closed connection)
  167. # [18:33] * Joins: rhauck (~Adium@public.cloak)
  168. # [18:38] * Joins: gitbot (~gitbot@public.cloak)
  169. # [18:38] -gitbot:#testing- [web-platform-tests] Ms2ger closed pull request #363: Revert "Merge pull request #358 from ayg/submission/ayg-use-webidl2" (master...revert-pull-request-358) https://github.com/w3c/web-platform-tests/pull/363
  170. # [18:38] * Parts: gitbot (~gitbot@public.cloak) (gitbot)
  171. # [19:17] * Quits: mdas (~mdas@public.cloak) (Client closed connection)
  172. # [19:18] * Joins: mdas (~mdas@public.cloak)
  173. # [19:25] * Quits: mdas (~mdas@public.cloak) (Ping timeout: 180 seconds)
  174. # [19:28] * Quits: glenn_ (~gadams@public.cloak) (Client closed connection)
  175. # [19:29] * Joins: glenn (~gadams@public.cloak)
  176. # [19:36] * Quits: glenn (~gadams@public.cloak) (Ping timeout: 180 seconds)
  177. # [19:48] * Joins: AutomatedTester (~AutomatedTester@public.cloak)
  178. # [20:35] * Joins: Lachy (~Lachy@public.cloak)
  179. # [20:41] * Joins: glenn (~gadams@public.cloak)
  180. # [21:15] * Joins: zcorpan (~zcorpan@public.cloak)
  181. # [21:20] * Quits: AutomatedTester (~AutomatedTester@public.cloak) (Client closed connection)
  182. # [21:22] * Quits: zcorpan (~zcorpan@public.cloak) (Ping timeout: 180 seconds)
  183. # [21:24] <tobie> jgraham: 2 reverts out of 350+ pull request is an edge case in my book.
  184. # [21:29] * Joins: zcorpan (~zcorpan@public.cloak)
  185. # [21:33] * Joins: AutomatedTester (~AutomatedTester@public.cloak)
  186. # [21:57] * Quits: ArtB (~abarsto@public.cloak) ("Leaving.")
  187. # [22:00] * Joins: abarsto (~abarsto@public.cloak)
  188. # [22:00] * abarsto is now known as ArtB
  189. # [22:17] * Quits: AutomatedTester (~AutomatedTester@public.cloak) (Client closed connection)
  190. # [22:29] * Joins: jhammel (~jhammel@public.cloak)
  191. # [22:32] * Joins: AutomatedTester (~AutomatedTester@public.cloak)
  192. # [22:41] * Joins: Ms2ger (~Ms2ger@public.cloak)
  193. # [23:06] * Quits: AutomatedTester (~AutomatedTester@public.cloak) (Client closed connection)
  194. # [23:15] * Quits: jhammel (~jhammel@public.cloak) ("leaving")
  195. # [23:21] * Joins: jhammel (~jhammel@public.cloak)
  196. # [23:29] * Quits: jhammel (~jhammel@public.cloak) ("leaving")
  197. # [23:29] * Quits: Ms2ger (~Ms2ger@public.cloak) (Ping timeout: 180 seconds)
  198. # [23:38] * Quits: rhauck (~Adium@public.cloak) ("Leaving.")
  199. # [23:38] * Joins: rhauck (~Adium@public.cloak)
  200. # [23:39] * Joins: Ms2ger (~Ms2ger@public.cloak)
  201. # [23:45] * Quits: rhauck (~Adium@public.cloak) (Ping timeout: 180 seconds)
  202. # [23:49] * Quits: Ms2ger (~Ms2ger@public.cloak) (Ping timeout: 180 seconds)
  203. # Session Close: Sat Oct 05 00:00:00 2013

The end :)