Previous day | Jump to hour: 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | Next day

Seconds: Show Hide | Joins: Show Hide | View raw
Font: Serif Sans-Serif Monospace | Size: Small Medium Large

Click in the nick column to highlight everything a person has said.
The Logo icon identifies that the person is a core developer (has commit access).

#rockbox log for 2023-07-03

00:30:32 Quit S|h|a|w|n (Read error: Connection reset by peer)
00:31:25 Join S|h|a|w|n [0] (~shawn156@user/shawn/x-4432647)
00:37:16 Quit m01 (Quit: Konversation terminated.)
00:39:56 Join m01 [0] (
00:54:23 Join nopal [0] (
00:54:32 Quit nopal (Remote host closed the connection)
01:31:30***Saving seen data "./dancer.seen"
02:32:35 Quit LjL (Read error: Connection reset by peer)
02:33:04 Join LjL [0] (~ljl@user/ljl)
03:31:32***Saving seen data "./dancer.seen"
04:06:12 Quit speachy (Ping timeout: 240 seconds)
05:31:35***Saving seen data "./dancer.seen"
05:44:30 Join Dook [0] (
06:12:32 Join hyvoid [0] (
06:24:32 Quit S|h|a|w|n (Read error: Connection reset by peer)
07:31:36***Saving seen data "./dancer.seen"
08:14:06 Quit fourHZ (Quit: Client closed)
08:23:13 Join Acou_Bass [0] (
08:25:47 Quit Piece_Maker (Ping timeout: 264 seconds)
08:25:47 Nick Acou_Bass is now known as Piece_Maker (
08:59:49DookTrying to set up git to push to the gerrit and I've been getting a " ! [remote rejected] HEAD -> refs/for/master (no common ancestry)" error. Anyone know a fix?
09:31:39***Saving seen data "./dancer.seen"
09:36:27 Quit Nyaa (Ping timeout: 245 seconds)
10:03:03 Join fourHZ [0] (
10:06:22 Join speachy [0] (
10:06:22 Quit speachy (Changing host)
10:06:22 Join speachy [0] (~speachy@rockbox/developer/speachy)
10:06:22Mode"#rockbox +v speachy" by ChanServ (
10:07:28speachyDook: Sounds like what you're trying to push doesn't properly line up with the master branch.
10:08:14speachywhat does 'git pull −−rebase origin master' come up with?
10:09:06 Join Nyaa [0] (
10:18:47Dookspeachy: says that the "Current branch master is up to date."
10:19:13DookIf it helps I'm currently testing on the sandbox repo
10:19:37speachyah, I can't comment about the state of the sandbox. I've never even looked at it. :D
10:20:27DookShoot. I'll try it on the themesite repo as well since it's what I want to commit
10:25:13DookYeah I'm getting the same error on the themesite repo, and the same message with rebasing
10:30:06speachyThis error is only supposed to be _possible_ if there are no commits in common in your repo vs the one you're trying to push to.
10:31:55speachyall I can suggest is to export the changes you want (ie with git format-patch), start with a fresh (and complete/non-shallow) clone of the source repo, re-apply those patches (git am) and try again?
10:50:36DookGot a fresh clone, added in the changes manually since it's just one line. Then used pretty much the same steps in the UsingGit wiki page, same result as earlier
10:50:55DookThink I'm going to go and look at how to debug this better, since it really should be working.
10:52:07gevaertsWhich *exact* git commands did you run?
10:54:08Dookgevaerts: to start I used "git remote set-url −−push origin ssh://", "curl -Lo .git/hooks/commit-msg" and "chmod +x .git/hooks/commit-msg" to setup
10:55:02 Quit Dook (Remote host closed the connection)
10:55:21 Join Dook [0] (
10:55:31speachyhow did you clone the original repo?
10:55:46DookThen git add, git commit and git push origin HEAD:refs/for/master
10:56:19DookI used "git clone git://"
10:57:58speachyI went through all of that and succeeded, here.
10:58:12speachysome global git config wonkiness?
10:59:34DookPossibly yeah
10:59:42DookI'm going to try it in a vm
10:59:54gevaerts"git remote set-url −−push origin ssh://" is for the *rockbox* repository. For the themesite you need to adjust that
11:00:22speachywhoops, heh, eyes auto-corrected that.
11:00:28DookOh my god
11:00:43DookThank you, I'm gonna blame tunnel vision on this one
11:01:35DookYep, worked! Thanks again gevaerts
11:04:28speachyDook: 100 files in a theme isn't enough? :D
11:04:55DookI've somehow managed to hit 114 and still be under 2mb haha
11:06:22speachyit'll be live in another 10 minutes. if that's not quick enough for you I'll force a refresh
11:06:29gevaertsThe 100 was probly picked fairly arbitrarily as "more than any theme currently there"
11:06:57gevaertsObviously that should have been a power of two like 128 :)
11:07:11DookOh no worries I can wait! Decided to make a few extra changes to the theme in the meantime
11:07:34gevaertsThemes are never *really* done
11:07:49DookThey really aren't haha
11:08:01speachyit's live
11:08:08DookThanks speachy!
11:08:36DookThis theme is pretty big, the sbs itself is 22.9kb
11:09:56speachythemesite definitely needs love, more patches welcome
11:10:43DookYeah I would like to make it allow a theme's asset folder to have subfolder since rockbox itself works with them, definitely will be working on it again :)
11:17:41 Quit Dook (Quit: Leaving)
11:31:43***Saving seen data "./dancer.seen"
12:16:18 Quit Xeha (Server closed connection)
12:16:32 Join Xeha [0] (~Xeha@user/Xeha)
13:31:47***Saving seen data "./dancer.seen"
14:05:17 Quit fourHZ (Quit: walking to the forest now)
14:44:46 Quit tertu (Quit: so long...)
14:46:04 Join tertu [0] (~tertu@user/tertu)
15:03:24 Join S|h|a|w|n [0] (~shawn156@user/shawn/x-4432647)
15:03:28 Join PheralSparky [0] (~shawn156@user/shawn/x-4432647)
15:03:30 Quit PheralSparky (Remote host closed the connection)
15:03:49 Nick S|h|a|w|n is now known as PheralSparky (~shawn156@user/shawn/x-4432647)
15:31:51***Saving seen data "./dancer.seen"
16:34:11 Join fourHZ [0] (
16:35:26fourHZoh the wiki is up. thank you.
16:55:11 Quit Nyaa (Ping timeout: 264 seconds)
17:08:55 Join Nyaa [0] (
17:31:53***Saving seen data "./dancer.seen"
18:47:27 Join massiveH [0] (~massiveH@2600:4040:a99f:1f00:34e6:9c21:9982:655f)
18:51:28 Join S|h|a|w|n [0] (~shawn156@user/shawn/x-4432647)
18:53:53 Quit PheralSparky (Ping timeout: 246 seconds)
18:53:56 Join MonTaGaTnoM [0] (~shawn156@user/shawn/x-4432647)
18:56:04 Quit S|h|a|w|n (Ping timeout: 246 seconds)
19:31:57***Saving seen data "./dancer.seen"
19:35:52 Quit MonTaGaTnoM (Read error: Connection reset by peer)
19:37:42 Join S|h|a|w|n [0] (~shawn156@user/shawn/x-4432647)
20:11:44 Join captainkewllllll [0] (
20:14:35 Quit captainkewllllll (Client Quit)
20:18:03 Quit S|h|a|w|n (Remote host closed the connection)
20:19:45 Join S|h|a|w|n [0] (~shawn156@user/shawn/x-4432647)
21:22:45 Quit advcomp2019_ (Ping timeout: 250 seconds)
21:31:59***Saving seen data "./dancer.seen"
22:15:02 Join advcomp2019 [0] (~advcomp20@user/advcomp2019)
22:48:11 Join Bochsy [0] (~LeastRece@user/LstRcntlyAccssd)
23:26:25 Quit pixelma (Quit: .)
23:26:25 Quit amiconn (Quit: - Chat comfortably. Anywhere.)
23:28:50 Join pixelma [0] (
23:28:51 Join amiconn [0] (
23:32:03***Saving seen data "./dancer.seen"
23:33:55 Quit massiveH (Quit: Leaving)

Previous day | Next day