01:34:37 Unstable branch on crawl.develz.org updated to: 0.27-a0-1513-g2aaa0cc67b (34) 01:55:46 Windows builds of master branch on crawl.develz.org updated to: 0.27-a0-1513-g2aaa0cc67b 02:53:50 Monster database of master branch on crawl.develz.org updated to: 0.27-a0-1513-g2aaa0cc67b 02:55:11 Unstable branch on cbro.berotato.org updated to: 0.27-a0-1513-g2aaa0cc67b (34) 03:32:12 Fork (bcrawl) on crawl.kelbi.org updated to: 0.23-a0-4217-g7c68dc2372 03:47:59 Fork (bcadrencrawl) on crawl.kelbi.org updated to: 0.03-596-ga03c02ce52 10:07:43 -!- allbery_b is now known as geekosaur 10:27:47 <10PleasingFungus> https://discord.com/channels/205277826788622337/205316046230388737/863063013271797830 new canon 10:30:13 <08nicolae> ithoripede, tell me more 10:32:12 <10PleasingFungus> when you take normal damage, some of it turns into poison damage instead. you can spend poison to power effects. 10:33:09 <10PleasingFungus> also maybe you can turn into a poison lich. 10:33:29 <10PleasingFungus> might get implemented in 0.28 or 0.29. 10:41:45 03PleasingFungus02 07* 0.27-a0-1514-g5dd8012253: New Holy Roller title (PF (particleface)) 10(35 seconds ago, 1 file, 2+ 0-) 13https://github.com/crawl/crawl/commit/5dd80122531a 10:45:31 <08nicolae> lol 10:45:35 <08nicolae> i love the skill titles 10:49:54 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-1514-g5dd8012253 (34) 11:37:49 03robertxgray02 07https://github.com/crawl/crawl/pull/1892 * 0.27-a0-1515-g9b3becd798: Update Android build 10(3 months ago, 98 files, 5016+ 2075-) 13https://github.com/crawl/crawl/commit/9b3becd798fe 11:41:12 03gammafunk02 07* 0.27-a0-1515-g8568cbafd6: Rework a transporter vault 10(11 hours ago, 1 file, 30+ 26-) 13https://github.com/crawl/crawl/commit/8568cbafd6d8 11:49:07 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-1515-g8568cbafd6 (34) 12:33:10 03ebering02 07* 0.27-a0-1516-gb01f110dc7: fix: correctly sum a geometric series 10(3 minutes ago, 1 file, 13+ 3-) 13https://github.com/crawl/crawl/commit/b01f110dc712 12:39:40 03ebering02 07* 0.27-a0-1517-g1ef64ffb57: fix: correct capitalization of Storm fists 10(14 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/1ef64ffb5719 12:44:48 03robertxgray02 07https://github.com/crawl/crawl/pull/1892 * 0.27-a0-1515-g7223c3f1bc: Update Android build 10(3 months ago, 98 files, 5032+ 2086-) 13https://github.com/crawl/crawl/commit/7223c3f1bc7a 12:49:31 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-1517-g1ef64ffb57 (34) 13:10:18 03robertxgray02 07https://github.com/crawl/crawl/pull/1892 * 0.27-a0-1515-g0da4e6581a: Update Android build 10(3 months ago, 98 files, 5024+ 2086-) 13https://github.com/crawl/crawl/commit/0da4e6581a8d 13:21:48 03ebering02 07* 0.27-a0-1518-gf355649ca4: fix: highlight gozag gold blue in webtiles under distraction aura 10(2 minutes ago, 2 files, 2+ 2-) 13https://github.com/crawl/crawl/commit/f355649ca411 13:29:01 Unstable branch on crawl.akrasiac.org updated to: 0.27-a0-1517-g1ef64ff (34) 13:31:58 03ebering02 07* 0.27-a0-1519-gc8121b24ce: fix: fix the previous fix 10(18 seconds ago, 1 file, 0+ 3-) 13https://github.com/crawl/crawl/commit/c8121b24ce83 13:35:04 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-1518-gf355649ca4 (34) 13:37:06 03robertxgray02 07https://github.com/crawl/crawl/pull/1892 * 0.27-a0-1515-g3adc76d40c: Update Android build 10(3 months ago, 98 files, 5024+ 2086-) 13https://github.com/crawl/crawl/commit/3adc76d40c4a 13:49:20 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-1519-gc8121b24ce (34) 18:24:08 Unstable branch on underhound.eu updated to: 0.27-a0-1519-gc8121b24ce (34) 20:46:02 03hellmonk02 07[shoals_encompass] * 0.27-a0-1294-gc0fe900925: Really really fix a lua test (gammafunk) 10(40 seconds ago, 1 file, 13+ 4-) 13https://github.com/crawl/crawl/commit/c0fe900925bb 20:46:03 Branch pull/2003 updated to be equal with shoals_encompass: 13https://github.com/crawl/crawl/pull/2003 20:50:47 03hellmonk02 07[shoals_encompass] * 0.27-a0-1295-gaa7880df55: checkwhite 10(18 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/aa7880df55fe 20:50:49 Branch pull/2003 updated to be equal with shoals_encompass: 13https://github.com/crawl/crawl/pull/2003 21:15:59 04Build failed for 08shoals_encompass @ c0fe9009 06https://github.com/crawl/crawl/actions/runs/1016901645 21:16:20 04Build failed for 08shoals_encompass @ aa7880df 06https://github.com/crawl/crawl/actions/runs/1016910592 21:43:02 <08nicolae> okay, my quotes branch pull request is done, what's the procedure for making it nice and then putting it in trunkwise 21:43:14 <08nicolae> (technically it was done the other day but i was tired) 21:45:22 <10PleasingFungus> being tired is valid 21:45:28 <10PleasingFungus> and you are valid 21:45:56 <08nicolae> i am not even close to being valid 21:46:08 <10PleasingFungus> dang 21:46:13 <10PleasingFungus> ok, so our goal is to get to a reasonable number of commits 21:46:40 <10PleasingFungus> like, if someone looks at the history of the master branch in git, every commit will make sense, without fixmes or w/e 21:46:56 <08nicolae> i'm thinking i could probably get them all into just one commit, that adds the quotes, and includes the checkwhite and quote removal 21:46:59 <10PleasingFungus> yep 21:47:02 <10PleasingFungus> i agree with that plan 21:47:05 <10PleasingFungus> so there are two ways to do that 21:47:12 <10PleasingFungus> option 1 is to do an 'interactive rebase' 21:47:22 <10PleasingFungus> option 2 is a 'git reset' 21:47:33 <10PleasingFungus> they both work in this case; i'll talk about each in turn 21:47:37 <08nicolae> okiedoke 21:47:49 <10PleasingFungus> for either option, you need to start by finding the first commit that you actually made 21:47:54 03gammafunk02 07[shoals_encompass] * 0.27-a0-1296-gc994cd4203: Fix the return value of a dungeon lua API method 10(8 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/c994cd4203c4 21:47:54 03gammafunk02 07[shoals_encompass] * 0.27-a0-1297-g5147735e2c: Simplify a lua test and reindent 10(6 minutes ago, 1 file, 61+ 63-) 13https://github.com/crawl/crawl/commit/5147735e2cb3 21:47:56 Branch pull/2003 updated to be equal with shoals_encompass: 13https://github.com/crawl/crawl/pull/2003 21:47:58 <10PleasingFungus> so you can do git log and look down 21:48:08 <10PleasingFungus> in your case, it's gonna be 35a2585 21:48:09 <10PleasingFungus> i believe 21:48:58 <10PleasingFungus> for option (1), you'll do git rebase 35a2585^ -i 21:49:29 <10PleasingFungus> the ^ means 'the commit before'. What you're saying is, "let me edit my git history, starting at the commit before my first change'. 21:49:32 <10PleasingFungus> that will pop up a command-line text editor listing out your changes. 21:49:52 <08nicolae> q 21:49:59 <08nicolae> oh this isn't the terminal window, whoopsy 21:50:01 <10PleasingFungus> since you only want one commit, you're going to leave the first one on the default, pick, and the others will be squash, or just s. 21:50:02 <10PleasingFungus> haha 21:50:54 <10PleasingFungus> once you edit it to that and close the editor, you'll get another window showing you a commit message. You'll want to delete everything leftover from the later commits, and reword the original if you really want. 21:50:55 <08nicolae> pick 35a2585975 Adding new quotes to the Crawl quotes list squash 7d037859a2 My very first checkwhite commit! squash 281be5c9c6 Removing some submitted quotes 21:50:57 <10PleasingFungus> yep! 21:50:58 <08nicolae> like that? 21:51:00 <10PleasingFungus> exactly 21:51:10 <10PleasingFungus> and you can just say s instead of squash to save typing. 21:51:24 <10PleasingFungus> this will tell git to squash all of the later commits onto the earlier one. 21:52:50 <10PleasingFungus> that's it, btw! that's the end of option 1. 21:53:58 <08nicolae> done 21:54:04 <08nicolae> we might not need option 2 21:54:42 <08nicolae> i guess it couldn't hurt to know. one question: since the commits are much longer than 8 hex digits, how much of the 35a2585... is necessary? is just 8 always fine 21:54:57 <10PleasingFungus> it's "however much is needed to be unambiguous" 21:55:04 <10PleasingFungus> i suspect you can often get away with fewer digits if you really want 21:55:10 <10PleasingFungus> and in principle you might at some point need more 21:55:17 <10PleasingFungus> if two commits had very similar hashes 21:55:53 <10PleasingFungus> for future reference, option 2 was to instead say git reset 35a2585^. That'll put you in a state where your changes are still there on disk, but the associated commits are gone, so you can just make a new commit with all of the changes (git add . && git commit). 21:56:07 <10PleasingFungus> that blows away the old commit messages, of course, so you might not want it, but it does have fewer steps. 21:57:09 <08nicolae> i see! 21:57:25 and only works if you want one big commit, which here you do 21:57:48 <08nicolae> okay, i tried doing git push origin nicolae-quotes-0721 ! [rejected] nicolae-quotes-0721 -> nicolae-quotes-0721 (non-fast-forward) error: failed to push some refs to 'https://github.com/crawl/crawl.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. 21:57:48 hint: See the 'Note about fast-forwards' in 'git push --help' for details. 21:59:14 I think you have to do a force-push after that 21:59:28 because you made some commits go away 22:00:27 <08nicolae> git push --force origin nicolae-quotes-0721? 22:00:31 <08nicolae> or do i not need the origin 22:00:40 <08nicolae> i should probably read a git tutorial at some point 😬 22:02:45 03Nicolae Carpathia02 07[nicolae-quotes-0721] * 0.27-a0-1435-g3d0ef47e75: Adding new quotes to the Crawl quotes list 10(7 days ago, 1 file, 291+ 15-) 13https://github.com/crawl/crawl/commit/3d0ef47e75c1 22:02:47 Branch pull/2011 updated to be equal with nicolae-quotes-0721: 13https://github.com/crawl/crawl/pull/2011 22:03:08 <08nicolae> oh, there we go 22:03:19 <08nicolae> all right. we're good. now for the big merge 22:03:38 <10PleasingFungus> yes, thanks geekosaur (on all points) 22:03:43 <08nicolae> indeed 22:03:52 <10PleasingFungus> oh shoot 22:03:54 <10PleasingFungus> before i forget 22:04:09 <08nicolae> oh no 22:04:12 <10PleasingFungus> very small thing: that commit message is in the wrong tense 22:04:17 <10PleasingFungus> should be "Add new quotes..." 22:04:19 <10PleasingFungus> not "adding" 22:05:06 <08nicolae> dang 22:05:27 <08nicolae> should i fix it, do i have to do the rebase thing 22:05:29 you can git amend and re-push, I think 22:05:55 git amend -m 'Add new...' 22:06:51 03Nicolae Carpathia02 07[nicolae-quotes-0721] * 0.27-a0-1435-g7b03791ad5: Add new quotes to the Crawl quotes list 10(7 days ago, 1 file, 291+ 15-) 13https://github.com/crawl/crawl/commit/7b03791ad5a6 22:06:53 Branch pull/2011 updated to be equal with nicolae-quotes-0721: 13https://github.com/crawl/crawl/pull/2011 22:07:17 <08nicolae> there we go 22:08:24 <08nicolae> okay! now it's time to merge 22:09:54 <10PleasingFungus> Huzzah! 22:10:26 <08nicolae> 😎 22:13:15 <08nicolae> so what's the merge process 22:13:27 press the big friendly merge button on the PR 22:14:27 03Nicolae Carpathia02 07* 0.27-a0-1435-g7b03791ad5: Add new quotes to the Crawl quotes list 10(7 days ago, 1 file, 291+ 15-) 13https://github.com/crawl/crawl/commit/7b03791ad5a6 22:14:27 03nicolae-carpathia02 {GitHub} 07* 0.27-a0-1521-g1261f788d9: Merge pull request #2011 from crawl/nicolae-quotes-0721 10(4 seconds ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/1261f788d98e 22:14:37 <08nicolae> oh god. i did it. 22:15:08 <10PleasingFungus> you did it! 22:15:12 <08nicolae> should i delete it, what's the etiquette there 22:15:19 <10PleasingFungus> probably but it doesn't matter much 22:15:21 <10PleasingFungus> also 22:15:24 <10PleasingFungus> one small thing for next time 22:15:41 <10PleasingFungus> next to the merge button, there's a little arrow dropdown 22:15:42 <10PleasingFungus> that lets you choose 'rebase and merge' 22:15:42 Meowism (L16 DsFi) ERROR in 'dbg-scan.cc' at line 684: Exit exit_swamp[98] didn't get generated. (Swamp:1) 22:15:56 <10PleasingFungus> that means you don't get the naughty little "merge pull request" commit added in 22:16:07 <08nicolae> ooooh 22:16:17 <06advil> a merge commit 😱 22:16:42 03hellmonk02 {gammafunk} 07* 0.27-a0-1522-g1d15788f7f: Two new encompass Shoals rune vaults 10(4 weeks ago, 1 file, 346+ 0-) 13https://github.com/crawl/crawl/commit/1d15788f7f08 22:16:42 03hellmonk02 {gammafunk} 07* 0.27-a0-1523-gd9be06fd8e: Fix a shoals lua test 10(25 hours ago, 1 file, 13+ 1-) 13https://github.com/crawl/crawl/commit/d9be06fd8e42 22:16:42 03gammafunk02 07* 0.27-a0-1524-g4b6fb3c526: Fix the return value of a dungeon lua API method 10(36 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/4b6fb3c5264a 22:16:42 03gammafunk02 07* 0.27-a0-1525-g1038ab4fd7: Simplify a lua test and reindent 10(35 minutes ago, 1 file, 61+ 63-) 13https://github.com/crawl/crawl/commit/1038ab4fd767 22:16:46 <08nicolae> 😔 22:17:07 <06advil> it's ok, I forgive you 22:17:31 <08nicolae> mea culpa, mea maxima culpa 22:17:40 <06advil> not really sure why we are so anti merge commits, except that they are a bit cluttered when your commit history is so long 22:18:17 lots of devs dislike the clutter, yeh 22:19:42 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-1521-g1261f788d9 (34) 22:19:57 <06advil> although now that I think about it we often have the complaint that PR discussion is inaccessible from the commits themselves, but using merge commits would solve that 22:20:12 <08nicolae> i have put all the information from this chat into a text file, for Later 22:20:22 <08nicolae> also: is there a way to not have to put in your username and password every time you push something 22:20:31 <06advil> there are a few 22:20:59 <10PleasingFungus> think modern github lets you get to the PRs anyway 22:21:02 you can register an ssh key with github, then it'll use that 22:21:08 <10PleasingFungus> maybe 22:21:18 <10PleasingFungus> hm, maybe not 22:22:07 <06advil> I use personal access tokens (https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token) with a git credentials file, I think that is what github recommends basically 22:26:30 <08nicolae> we'll see next time i have a branch to push i guess 22:29:28 <08nicolae> now to update trunk and look at some quotes... 22:34:05 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-1525-g1038ab4fd7 (34)