!OqhvaDMJdKYUicLDiE:nixos.org

Nixpkgs Stdenv

136 Members
49 Servers

Load older messages


SenderMessageTime
19 Sep 2024
@artturin:matrix.orgArtturin

K900:

Idea is OK, list of merge conflicts is scary. Maybe do this stepwise?

What's the advantage?

18:21:25
20 Sep 2024
@rosscomputerguy:matrix.orgTristan Ross
In reply to @artturin:matrix.org

K900:

Idea is OK, list of merge conflicts is scary. Maybe do this stepwise?

What's the advantage?

Easier to manage, GH restricts the size of the diff. Unless I want to build a PR, I wouldn't want to review in the terminal. GH's diff viewer is pretty convenient.
02:40:10
@artturin:matrix.orgArtturin
In reply to @rosscomputerguy:matrix.org
Easier to manage, GH restricts the size of the diff. Unless I want to build a PR, I wouldn't want to review in the terminal. GH's diff viewer is pretty convenient.
There's simply no way to review this change manually, the only way is to copy the commands in the commit msg and diffoscope, but first drop the formatting commit because I didn't post the command for it(I'll add it later)
02:45:03
@artturin:matrix.orgArtturinMaybe there's performance issues when rebasing and getting conflicts from a large commit?02:47:07
@artturin:matrix.orgArtturinThat would be a valid reason to split it02:47:26
@artturin:matrix.orgArtturin* That would be a valid reason to split the change in to a few commits in the same PR02:48:10
@rosscomputerguy:matrix.orgTristan RossMaybe but still like to review manually02:52:18
@emilazy:matrix.orgemilyyou're going to manually review >4,000 files?11:30:51
@emilazy:matrix.orgemilyI think spot checks are the most we can hope for here11:31:02
@emilazy:matrix.orgemilythe important thing is just it getting 0 rebuilds11:31:18
@artturin:matrix.orgArtturin
In reply to @emilazy:matrix.org
the important thing is just it getting 0 rebuilds
https://github.com/NixOS/nixpkgs/pull/341407#issuecomment-2353173805
11:32:55
@emilazy:matrix.orgemilyright :)11:33:19
@emilazy:matrix.orgemilyI shouldn't have said 0 strictly11:33:31
@emilazy:matrix.orgemilyI more meant "if we can account for every single rebuild that gives us stronger confidence we're not changing semantics than manual review could"11:33:47
@aleksana:mozilla.orgaleksana (force me to bed after 18:00 UTC) joined the room.14:13:25
@cafkafk:gitter.imcafkafk joined the room.14:29:50
@rosscomputerguy:matrix.orgTristan Ross
In reply to @emilazy:matrix.org
you're going to manually review >4,000 files?
No, I want to review the stuff I am a codeowner/maintainer of.
16:47:04
@artturin:matrix.orgArtturin @rosscomputerguy:matrix.org: try files -> file filter -> files owned by you 17:39:49
@artturin:matrix.orgArtturinhttps://github.com/orgs/community/discussions/40474#discussioncomment-441112717:40:18
@rosscomputerguy:matrix.orgTristan Ross
In reply to @artturin:matrix.org
@rosscomputerguy:matrix.org: try files -> file filter -> files owned by you
Oh sweet, didn't even knew that button existed. Thanks.
17:40:53
@artturin:matrix.orgArtturinMe neither 17:41:44
@rosscomputerguy:matrix.orgTristan Rossimage.png
Download image.png
17:41:56
@rosscomputerguy:matrix.orgTristan RossOh, this isn't good17:41:57
21 Sep 2024
@me:linj.techlinj joined the room.05:20:52
23 Sep 2024
@connorbaker:matrix.orgconnor (he/him) (UTC-7) changed their display name from connor (he/him) (UTC-5) to connor (he/him) (UTC-7).17:57:50
24 Sep 2024
@emilazy:matrix.orgemily Artturin: needs another rebase 18:58:50
@emilazy:matrix.orgemilybit of a race against time18:59:22
@emilazy:matrix.orgemilyI will hit the button as soon as it merges cleanly and ofborg evals cleanly, ping me if necessary18:59:38
@artturin:matrix.orgArtturinI don't think it'll be possible to have ofborg evalled and no conflict19:00:35
@artturin:matrix.orgArtturinWe should let it eval now19:00:45

Show newer messages


Back to Room ListRoom Version: 9