Page MenuHomeSoftware Heritage
Paste P772

(An Untitled Masterwork)
ActivePublic
Actions

Authored by seirl on Sep 18 2020, 12:07 PM.
14:22:57 <+seirl> huh, D3906 didn't autoclose for some reason, but i updated it before merging it in master
14:22:58 -- Notice(swhbot): D3906 (author: seirl, Accepted) on swh-graph: Add edge labelling prototype <https://forge.softwareheritage.org/D3906>
14:23:13 <+seirl> i really don't understand the heuristic it uses
14:23:29 <+seirl> or maybe it's just slow
14:24:19 <+olasd> seirl: I see the arc diff --update at 14:21 and the push at 14:17
14:24:28 <+seirl> what
14:24:55 <+olasd> https://forge.softwareheritage.org/rDGRPHeaf0323a1c0194775235bf1f87308fccbf005be2 > pushed at 14:17; https://forge.softwareheritage.org/D3906 > updated at 14:21
14:24:55 -- Notice(swhbot): swh-graph/eaf0323a1c (author: seirl) java: labelling: allow multiple labels per edge <https://forge.softwareheritage.org/rDGRPHeaf0323a1c>
14:25:02 <+seirl> : 1600086080:0;arc diff --update D3906 origin/master
14:25:02 <+seirl> : 1600086097:0;git checkout master
14:25:02 <+seirl> : 1600086100:0;git merge edge_labels
14:25:02 <+seirl> : 1600086103:0;git push
14:25:31 <+olasd> the commit was pushed to the edge_labels remote branch at 14:17
14:25:46 <+olasd> phabricator didn't "see" it again
14:26:23 <+seirl> but isn't what matters just when the commit arrives in master? i'm completely lost
14:26:47 <+olasd> no, what matters is when the commit is first "published"; by default, all branches "publish" all commits
14:27:08 <+olasd> [redacted phabricator rant #247]
14:27:17 <+seirl> ?_?
14:27:39 <+seirl> what could i have done differently to make it notice the merge? not use a branch?
14:28:13 <+olasd> honestly? I don't know. the repository branch settings look correct, but the labels are so arcane that who even knows
14:28:24 <+olasd> (I guess the rant is spilling over)
14:29:36 <+olasd> https://secure.phabricator.com/book/phabricator/article/diffusion_permanent/
14:30:58 <+seirl> olasd: what the helllllll
14:31:06 <+olasd> swh-graph is configured with "master" as a permanent refs
14:31:22 <+zack> seirl: i've been hit by that before. My "fix" is to never push to a remote branch, just push to master upon landing
14:31:23 <+olasd> but I have no idea if that should be "master" or "refs/heads/master" or whatever
14:31:42 <+zack> "to a remote branch" other than master, that is
About · Developer information · Legal