Options:
Previous day, Next day
- # Session Start: Thu May 07 00:00:00 2015
- # Session Ident: #testing
- # [00:08] * Quits: Lachy (~Lachy@public.cloak) ("My MacBook Pro has gone to sleep. ZZZzzz…")
- # [00:08] * Joins: Lachy (~Lachy@public.cloak)
- # [00:31] * heycam|away is now known as heycam
- # [00:35] * Quits: playjax (~chatzilla@public.cloak) (Client closed connection)
- # [00:56] * Joins: gitbot (~gitbot@public.cloak)
- # [00:56] -gitbot:#testing- [web-platform-tests] dumbmatter opened pull request #1810: Various minor fixes to IndexedDB tests (master...dumbmatter/IndexedDB-fixes) https://github.com/w3c/web-platform-tests/pull/1810
- # [00:56] * Parts: gitbot (~gitbot@public.cloak)
- # [01:53] * Quits: bhill2 (~bhill2@public.cloak) (Client closed connection)
- # [02:00] * Quits: AutomatedTester (~AutomatedTester@public.cloak) (Client closed connection)
- # [02:09] <mkwst> Hello, friendly testing people! What's the right thing to do with a PR that's turned into a set of a dozen or so commits? Squash before merging? (https://github.com/w3c/web-platform-tests/pull/1807)
- # [02:50] * terri is now known as terri_offline
- # [03:03] * Disconnected
- # [04:02] * Attempting to rejoin channel #testing
- # [04:02] * Rejoined channel #testing
- # [04:02] * Topic is '<jgraham> A programmer has a problem. They think "I know I'll use submodules". Now they have a tree of problems.'
- # [04:02] * Set by odinho on Thu Apr 02 15:58:23
- # [04:26] * heycam is now known as heycam|away
- # [05:55] * heycam|away is now known as heycam
- # [06:58] * heycam is now known as heycam|away
- # [07:59] * Quits: terri_offline (~terri@public.cloak) (Client closed connection)
- # [07:59] * Joins: terri_offline (~terri@public.cloak)
- # [07:59] * terri_offline is now known as terri
- # [08:01] * heycam|away is now known as heycam
- # [08:06] <MikeSmith> mkwst: I used to take the time to squash but then got lazy and just push the green button
- # [08:06] <MikeSmith> so there's not really any policy
- # [08:07] <MikeSmith> but I guess it's probably better to squash if it's more than just 2 or 3 commits
- # [08:41] * Joins: plh (plehegar@public.cloak)
- # [08:47] * Joins: dom (dom@public.cloak)
- # [08:48] * Joins: Ms2ger (~Ms2ger@public.cloak)
- # [08:56] * Joins: ArtB (~ArtB@public.cloak)
- # [08:58] * Joins: darobin (rberjon@public.cloak)
- # [09:07] * Quits: plh (plehegar@public.cloak) (Client closed connection)
- # [09:36] * Joins: gitbot (~gitbot@public.cloak)
- # [09:36] -gitbot:#testing- [web-platform-tests] Velmont closed pull request #1810: Various minor fixes to IndexedDB tests (master...dumbmatter/IndexedDB-fixes) https://github.com/w3c/web-platform-tests/pull/1810
- # [09:36] * Parts: gitbot (~gitbot@public.cloak)
- # [09:36] * Joins: plh (plehegar@public.cloak)
- # [09:39] * Quits: plh (plehegar@public.cloak) ("Leaving")
- # [09:42] * Joins: plh (plehegar@public.cloak)
- # [09:44] * Quits: Lachy (~Lachy@public.cloak) ("My MacBook Pro has gone to sleep. ZZZzzz…")
- # [09:52] <odinho> I usually squash all the things. Normaly rebase on top too, but since GitHub merge button always does a merge, and it's simple to just click I see this "revision history should be beautiful" as a lost cause.
- # [09:52] <MikeSmith> yeah
- # [09:53] <MikeSmith> we're way past beautiful at this point I guess
- # [10:04] * Joins: Lachy (~Lachy@public.cloak)
- # [10:08] * heycam is now known as heycam|away
- # [10:21] <Ms2ger> Doesn't mean we shouldn't keep trying
- # [10:22] * Quits: plh (plehegar@public.cloak) (Ping timeout: 180 seconds)
- # [10:24] <jgraham> Ms2ger: We sort of officially decided that it meant exactly that :)
- # [10:32] * Quits: dom (dom@public.cloak) (Ping timeout: 180 seconds)
- # [10:58] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
- # [10:58] * Joins: darobin (rberjon@public.cloak)
- # [11:04] <MikeSmith> github UI should have a "squash and rebase" button
- # [11:05] * Joins: dom (dom@public.cloak)
- # [11:05] <jgraham> Yeah, really
- # [11:11] * Joins: plh (plehegar@public.cloak)
- # [11:14] * Joins: juris (~juris@public.cloak)
- # [11:16] * Quits: playjax (~chatzilla@public.cloak) (Ping timeout: 180 seconds)
- # [11:21] * Quits: juris (~juris@public.cloak) (Ping timeout: 180 seconds)
- # [11:22] * Quits: ArtB (~ArtB@public.cloak) ("Leaving.")
- # [12:11] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
- # [12:16] * Quits: dom (dom@public.cloak) (Ping timeout: 180 seconds)
- # [12:35] * Joins: playjax (~chatzilla@public.cloak)
- # [12:41] * Joins: darobin (rberjon@public.cloak)
- # [12:46] * Quits: playjax (~chatzilla@public.cloak) (Client closed connection)
- # [12:51] * Joins: playjax (~chatzilla@public.cloak)
- # [13:41] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
- # [13:41] * Joins: darobin (rberjon@public.cloak)
- # [13:49] * Joins: ArtB (~ArtB@public.cloak)
- # [13:52] * Joins: guoyi (~guoyi@public.cloak)
- # [13:58] * Quits: playjax (~chatzilla@public.cloak) (Ping timeout: 180 seconds)
- # [13:59] * Quits: guoyi (~guoyi@public.cloak) (Ping timeout: 180 seconds)
- # [14:06] * Joins: scott_gonzalez (~scott_gonzalez@public.cloak)
- # [14:08] * Joins: guoyi (~guoyi@public.cloak)
- # [14:25] * Joins: AutomatedTester (~AutomatedTester@public.cloak)
- # [15:03] <odinho> I'd love that.
- # [15:03] <odinho> Especially for my own projects, where I still don't ever use the merge button. :)
- # [15:09] <ato> I know this is swearing in church, but I actually don't find merge commits so bad as they give you the PR context they were discussed in. If the commits involved in a merge were tested in batch, the merge commit can also contain other useful information about tests and who reviewed it, which you'd otherwise have to annotate every commit on the integration
- # [15:09] <ato> branch with.
- # [15:11] <jgraham> Irrespective of your position on merge commits (you are wrong btw ;) not being able to squash + rebase gives a messier history
- # [15:12] <ato> jgraham: Did something change in wpt recently that made updating Servo problematic? It aborted on me with a message about that a series of files would be overwritten?
- # [15:12] <odinho> If you squash, you can just add the PR URL at the end of the commit anyway.
- # [15:12] <odinho> Or as metadata in the header.
- # [15:13] <ato> When I googled^Wyahooed it, someone said it might be related to a conflict with my personal .gitignore or something.
- # [15:13] <ato> Unfortunately I didn't save the error message, and just rm -rf the wpt directory and reset.
- # [15:14] <jgraham> ato: something change in wpt that made updating *servo* problematic? Not as far as I know…
- # [15:14] <ato> Yes, I did `git pull` in servo, which I have set up to automatically update submodules, but it aborted.
- # [15:15] <ato> I wish I'd saved the error now.
- # [15:21] <jgraham> wpt isn't a submodule anymore
- # [15:21] <jgraham> So it was probably that
- # [15:22] <ato> Oh.
- # [15:22] * Quits: Ms2ger (~Ms2ger@public.cloak) (Ping timeout: 180 seconds)
- # [15:22] <ato> Because I have fetch.recurseSubmodules set, that probably conflicted with the commit to remove the submodules from servo.
- # [16:52] * Quits: plh (plehegar@public.cloak) ("Leaving")
- # [16:54] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
- # [16:57] * Joins: darobin (rberjon@public.cloak)
- # [17:04] * Quits: darobin (rberjon@public.cloak) (Ping timeout: 180 seconds)
- # [17:11] * Joins: scottgonzalez (~scott_gonzalez@public.cloak)
- # [17:16] * Quits: AutomatedTester (~AutomatedTester@public.cloak) (Client closed connection)
- # [17:16] * Joins: Ms2ger (~Ms2ger@public.cloak)
- # [17:18] * Quits: scott_gonzalez (~scott_gonzalez@public.cloak) (Ping timeout: 180 seconds)
- # [17:19] * Quits: scottgonzalez (~scott_gonzalez@public.cloak) (Ping timeout: 180 seconds)
- # [17:20] * Joins: gitbot (~gitbot@public.cloak)
- # [17:20] -gitbot:#testing- [wptrunner] jgraham created jgraham/metadata_improvements (+2 new commits): https://github.com/w3c/wptrunner/compare/a6c862a6bd6c^...1c5d165cd851
- # [17:20] -gitbot:#testing- wptrunner/jgraham/metadata_improvements a6c862a James Graham: Add --tags command line argument for slecting groups of tests....
- # [17:20] -gitbot:#testing- wptrunner/jgraham/metadata_improvements 1c5d165 James Graham: Support inheriting metadata from directories....
- # [17:20] * Parts: gitbot (~gitbot@public.cloak)
- # [17:20] * Joins: gitbot (~gitbot@public.cloak)
- # [17:20] -gitbot:#testing- [wptrunner] jgraham opened pull request #108: Add support for inheriting metadata from directory files, and for --tags for test selection (master...jgraham/metadata_improvements) https://github.com/w3c/wptrunner/pull/108
- # [17:20] * Parts: gitbot (~gitbot@public.cloak)
- # [17:26] * Joins: AutomatedTester (~AutomatedTester@public.cloak)
- # [17:42] * Quits: Lachy (~Lachy@public.cloak) ("My MacBook Pro has gone to sleep. ZZZzzz…")
- # [17:50] * Joins: scott_gonzalez (~scott_gonzalez@public.cloak)
- # [17:52] * Quits: AutomatedTester (~AutomatedTester@public.cloak) (Client closed connection)
- # [18:04] * Joins: bhill2 (~bhill2@public.cloak)
- # [18:06] * Quits: ArtB (~ArtB@public.cloak) ("Leaving.")
- # [18:07] * Quits: guoyi (~guoyi@public.cloak) ("Page closed")
- # [18:36] * Quits: scott_gonzalez (~scott_gonzalez@public.cloak) (scott_gonzalez)
- # [19:38] * terri is now known as terri_offline
- # [19:39] * terri_offline is now known as terri
- # [19:42] * Joins: bhill2_ (~bhill2@public.cloak)
- # [19:42] * Quits: bhill2 (~bhill2@public.cloak) (Client closed connection)
- # [20:13] * Joins: scott_gonzalez (~scott_gonzalez@public.cloak)
- # [20:18] * Quits: scott_gonzalez (~scott_gonzalez@public.cloak) (scott_gonzalez)
- # [20:47] * Joins: AutomatedTester (~AutomatedTester@public.cloak)
- # [21:23] * Joins: gitbot (~gitbot@public.cloak)
- # [21:23] -gitbot:#testing- [web-platform-tests] mikewest closed pull request #1807: Referrer Policy (master...referrer-policy) https://github.com/w3c/web-platform-tests/pull/1807
- # [21:23] * Parts: gitbot (~gitbot@public.cloak)
- # [21:47] * Joins: darobin (rberjon@public.cloak)
- # [21:52] * Quits: darobin (rberjon@public.cloak) ("Leaving...")
- # [22:06] * Joins: bhill2 (~bhill2@public.cloak)
- # [22:06] * Quits: bhill2_ (~bhill2@public.cloak) (Client closed connection)
- # [22:11] * Joins: Lachy (~Lachy@public.cloak)
- # [22:11] * Joins: scott_gonzalez (~scott_gonzalez@public.cloak)
- # [22:14] * heycam|away is now known as heycam
- # [22:52] * Joins: bhill2_ (~bhill2@public.cloak)
- # [22:52] * Quits: bhill2 (~bhill2@public.cloak) (Client closed connection)
- # [22:54] * Quits: scott_gonzalez (~scott_gonzalez@public.cloak) (scott_gonzalez)
- # [23:39] * heycam is now known as heycam|away
- # Session Close: Fri May 08 00:00:01 2015
Previous day, Next day
Think these logs are useful? Then please donate to show your gratitude (and keep them up, of course). Thanks! — Krijn