03:34:19 Experimental (bcrawl) branch on underhound.eu updated to: 0.23-a0-5208-geafff8c3b6 05:06:10 New branch created: pull/4078 (1 commit) 13https://github.com/crawl/crawl/pull/4078 05:06:11 03heinrich02 07https://github.com/crawl/crawl/pull/4078 * 0.33-a0-219-g66da7b15ee: Fixed Yred bind soul ability 10(38 minutes ago, 3 files, 10+ 28-) 13https://github.com/crawl/crawl/commit/66da7b15ee34 05:39:31 03heinrich02 07https://github.com/crawl/crawl/pull/4078 * 0.33-a0-220-g68033856b9: Fixed whitespace warning 10(20 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/68033856b9c8 06:14:39 MrSquiggles (L27 OpHW) ASSERT(mons.type != MONS_NO_MONSTER) in 'mon-death.cc' at line 3121 failed. (Zot:3) 08:03:42 <07zureal> not MrSquiggles!!! 09:48:04 New branch created: pull/4081 (1 commit) 13https://github.com/crawl/crawl/pull/4081 09:48:06 03Matthew Granstrom02 {GitHub} 07https://github.com/crawl/crawl/pull/4081 * 0.33-a0-219-g19c4976a2c: Remove Gell's Gravitas 10(64 seconds ago, 1 file, 4+ 4-) 13https://github.com/crawl/crawl/commit/19c4976a2c23 09:50:28 <06pleasingfungus> lol 10:36:34 <08nicolae> this is one problem with the custom books shop, but it does have its fans 😔 10:37:09 <04dracoomega> I mean, I consider this one my fault, not yours 10:43:44 <08nicolae> what's the right command to smush that PR in painlessly 10:43:49 <08nicolae> i wrote this all down somewhere but then closed the file 11:12:29 <09gammafunk> I consider this one everyone else's fault but mine, but I do especially consider it to be nicolae's fault 11:13:28 <09gammafunk> I think rebase and merge is fine 11:13:36 <09gammafunk> from the github UI, that is 11:14:04 <09gammafunk> from command-line there's a little bit more to it; I'm not sure if you've configured your git to pull additional github refs so that you can see pull requests 11:40:32 <08nicolae> factum est 11:41:07 03Matthew Granstrom02 {nicolae} 07* 0.33-a0-219-g44df65d264: Remove Gell's Gravitas 10(2 hours ago, 1 file, 4+ 4-) 13https://github.com/crawl/crawl/commit/44df65d2649a 11:49:41 gammafunk, that sounds somewhat odd to me: why would refs/pulls be needed? 11:50:02 I don't think I've ever needed it in any github project 12:01:58 I think beem is down. (not joining me on cbr2 and there are 0 specators on cao, cdi and cbr2 at least) 13:07:34 <09gammafunk> rypofalem: thanks, will look into it 13:09:20 <09gammafunk> geekosaur: The typical local repo workflow for github in the past has involved adding a ref source for origin for pull requests, for example I have in my git config for the crawl repo: [remote "origin"] url = https://github.com/crawl/crawl.git fetch = +refs/heads/*:refs/remotes/origin/* fetch = +refs/pull/*:refs/remotes/origin/pull/* 13:09:56 <09gammafunk> so that I can then check out (or just generally work with) origin/pull/NNNN/head as a branch to work with pull request NNNN 13:10:13 <09gammafunk> but I'm using 100% git here and no special github command-line tools 13:11:02 <09gammafunk> ...hah 13:11:10 ah. I use `gh` for that 13:11:33 <09gammafunk> right, probably I should learn those and recommend them to people (maybe they're better than working with git directly) 13:11:38 it adds an `upstream` ref (I normally work from a fork) and pulls PR refs from that, not from `origin` 13:12:04 <09gammafunk> an upstream ref or an upstream repo? 13:12:10 `gh pr checkout ` 13:12:14 <09gammafunk> or remote I should say, I guess 13:12:37 upstream remote; `origin` points to my fork, `upstream` points to the thing I forked from 13:12:41 <09gammafunk> ok, probably I need to mess around with those tools a bit 13:12:53 since `origin` won't have any PRs from the upstream repo on it 13:13:19 (it'll have my PRs as branches, of course, but nobody else's) 13:13:40 <09gammafunk> so I imagine that since my origin is the official crawl repo (I don't work with remotes that are forks generally), the upstream I would get from gh would be....the upstream fork that the PR was based on? 13:13:50 yes 13:13:55 <09gammafunk> I see, thanks 13:14:54 <09gammafunk> rypofalem: funny reason why beem went down: cpo switched to a new host so that its credentials no longer worked, hence it shut down everything 13:14:57 like, last night on the cabal repo I needed to check something on someone else's PR, so `gh pr checkout 10432` gave me a checkout of the other user's branch 13:15:30 and I didn't need to do any extra work, `gh` did it for me 13:16:06 <09gammafunk> sounds good, so long as I don't get confusing results when moving back to git. Often I want to leave a PR I've checked out as a branch to work with later etc 13:16:27 oh, this leaves you in normal git and it's just a branch as far as git is concerned 13:16:30 <09gammafunk> by "moving back to git" I mean switching to using git directly for whatever things I'm doing 13:16:34 you can switch between branches as usual 13:16:52 <09gammafunk> yeah, sounds useful then 13:17:09 I do this quite a lot with cabal dev 13:17:29 haven't done it with crawl yet but I haven't ever had a reason to do so 13:49:37 Ah, thanks gammafunk! 14:51:32 03DracoOmega02 07* 0.33-a0-220-g7c53e13f8b: Fix Flayed effect ending upon taking stairs with a ghost (staticshock) 10(6 minutes ago, 1 file, 31+ 30-) 13https://github.com/crawl/crawl/commit/7c53e13f8b09 14:51:32 03DracoOmega02 07* 0.33-a0-221-g6c17059a10: Fix agent-less monster::was_created_by() always returning false 10(2 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/6c17059a10aa 15:38:21 Unstable branch on underhound.eu updated to: 0.33-a0-221-g6c17059a10 (34) 16:59:42 <04dracoomega> Nothing like searching through old branches for some already-written code to repurpose and the commit you're looking for turns out to begin with the words 'Ill-conceived' 17:00:45 <04dracoomega> (But that was about the gameplay of the spell WIP, and not the code itself, which I can happily steal half of for something else) 17:04:14 sounds very crawl to me 😛 18:32:28 <06pleasingfungus> ooh 18:32:39 <06pleasingfungus> sounds like kate but i hope it was me 18:35:41 <04dracoomega> No, it was a commit I wrote (locally) 18:36:03 <04dracoomega> Basically "I didn't end up liking this, but I'm saving it because some part of it might be useful at some future time" 19:39:44 -!- The topic of #crawl-dev is: Crawl Development | https://github.com/crawl/crawl | Logs: http://s-z.org/crawl-dev/, temporarily http://crawl.akrasiac.org/logs/cheibriados/ | People with +v have commit access, devs on bridged discord as well | General Crawl-related chat to #crawl | Long stuff to a pastebin service, please 19:39:44 -!- The topic of #crawl is: Play Dungeon Crawl Stone Soup online now! Type ??online for instructions, ??lg / !lg for play stats | PM Sequell for long queries | http://crawl.develz.org | FooTV game replays: ??footv for instructions | #crawl-dev for dev discussion, #crawl-offtopic for offtopic 22:35:14 Unstable branch on crawl.develz.org updated to: 0.33-a0-221-g6c17059a10 (34) 22:57:10 Windows builds of master branch on crawl.develz.org updated to: 0.33-a0-221-g6c17059a10 23:13:05 Unstable branch on cbro.berotato.org updated to: 0.33-a0-221-g6c17059a10 (34) 23:54:43 Monster database of master branch on crawl.develz.org updated to: 0.33-a0-221-g6c17059a10