00:07:20 03RojjaCebolla02 07https://github.com/crawl/crawl/pull/1867 * 0.27-a0-886-ge748e31: Remove reference to bugzilla 10(2 days ago, 1 file, 6+ 11-) 13https://github.com/crawl/crawl/commit/e748e3115f82 00:29:19 03gammafunk02 07* 0.27-a0-891-ge335657: Some decorative Spider vaults from nicolae (12539) 10(2 days ago, 1 file, 97+ 24-) 13https://github.com/crawl/crawl/commit/e335657cc0cd 00:29:19 03gammafunk02 07* 0.27-a0-892-gd1b0476: Some monster vaults for Spider by nicolae (12539) 10(2 days ago, 1 file, 421+ 0-) 13https://github.com/crawl/crawl/commit/d1b0476733b0 00:31:46 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-892-gd1b0476733 (34) 01:04:46 New branch created: pull/1874 (1 commit) 13https://github.com/crawl/crawl/pull/1874 01:04:46 03ukdong9002 07https://github.com/crawl/crawl/pull/1874 * 0.27-a0-893-gd277a22: Just one ecumenical altar 10(9 minutes ago, 3 files, 32+ 0-) 13https://github.com/crawl/crawl/commit/d277a222abce 01:05:02 <05k​ate> oh hm, this transporter vault seems to have broken level generation pretty nicely 01:05:02 <05k​ate> i think it's gammafunk_its_a_trap, with the entrance teleporter in an enclosed closet 01:14:02 <05k​ate> i don't think i have access to get hold of saves so i put it on mantis for posterity, levelgen and connectivity is a mystery to me either way though 01:15:54 Disconnected transporter vault 13https://crawl.develz.org/mantis/view.php?id=12557 by Kate 01:23:21 -!- amalloy_ is now known as amalloy 01:34:35 Unstable branch on crawl.develz.org updated to: 0.27-a0-892-gd1b0476733 (34) 01:35:25 <09g​ammafunk> Yeah, I don't understand why sometimes layout just doesn't connect vaults properly like that in that it doesn't veto the resulting level 01:37:04 <05k​ate> yeah, i think i'd seen some similar reports where the disconnected area still had a hatch but generating fully disconnected areas like this is even weirder 01:40:21 03PleasingFungus02 07* 0.27-a0-893-g6585edb: Ban guardian golem for dj w/o summons 10(66 minutes ago, 1 file, 18+ 14-) 13https://github.com/crawl/crawl/commit/6585edb262a4 01:40:21 03PleasingFungus02 07* 0.27-a0-894-g88e0368: Tweak sac XL bonus piety 10(62 minutes ago, 1 file, 3+ 2-) 13https://github.com/crawl/crawl/commit/88e0368d9bba 01:40:21 03PleasingFungus02 07* 0.27-a0-895-gf93f109: Improve useless manual messaging 10(58 minutes ago, 1 file, 9+ 1-) 13https://github.com/crawl/crawl/commit/f93f10960d29 01:40:21 03PleasingFungus02 07* 0.27-a0-896-gf01432e: Make the Axe of Woe blow stuff up 10(48 minutes ago, 1 file, 7+ 0-) 13https://github.com/crawl/crawl/commit/f01432ee1706 01:40:21 03PleasingFungus02 07* 0.27-a0-897-g5cb13e7: Replace trees (Sastreii) 10(25 minutes ago, 40 files, 9+ 28-) 13https://github.com/crawl/crawl/commit/5cb13e721e47 01:40:21 03PleasingFungus02 07* 0.27-a0-898-g810843a: Add petrified trees (Sastrei) 10(51 seconds ago, 6 files, 29+ 1-) 13https://github.com/crawl/crawl/commit/810843a28dcd 01:42:16 <03w​heals> nice lair:8 01:49:00 <10P​leasingFungus> i agree 01:50:30 <05k​ate> wow, continuing the attacks on console players, rude 01:51:07 <10P​leasingFungus> did i...? 01:51:28 <05k​ate> petrified trees aren't exactly functional in console 01:51:46 <10P​leasingFungus> do they need a color or something 01:52:42 <05k​ate> they need a glyph! i don't know if that's possible to change in vaults (or if it should be), they show up as 8s 01:52:42 <10P​leasingFungus> hm 01:52:46 <10P​leasingFungus> i figured that was fine 01:53:04 <10P​leasingFungus> since they function as 8s 01:53:06 <12e​bering> replace them with t or we riot 01:53:24 <05k​ate> i guess it probably is better than them having the tree glyph, yeah 01:53:26 <12e​bering> (if you did them with t and COLOUR: it would be fine) 01:54:19 <12e​bering> oh, and add the veto_ to prevent burning maybe (if that's a separate veto still) 01:54:45 <05k​ate> oh actually they are just kinda not properly functional in general 01:54:49 <05k​ate> lrd calls them statues 01:55:05 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-898-g810843a28d (34) 01:55:39 Windows builds of master branch on crawl.develz.org updated to: 0.27-a0-898-g810843a28d 01:55:43 <05k​ate> although i think maybe there's functionality to pull out vault rename info for stuff like that? 02:00:27 03gammafunk02 07* 0.27-a0-899-ge2d0b17: A watery jumping spider vault by nicolae (12539) 10(4 minutes ago, 1 file, 362+ 0-) 13https://github.com/crawl/crawl/commit/e2d0b17c59d0 02:01:08 <05k​ate> ah possibly not, i guess it's a general issue with vault renames for the older stuff like sarcophagi and gravestones and things 02:01:08 <05k​ate> although at least these are much less likely to be lrded than the later renames 02:03:59 <05k​ate> oh it does work in some places actually, i like that in theory you could get a druid to make an "awoken dead tree" 02:04:19 <10P​leasingFungus> ooh 02:04:31 <03w​heals> fr: spriggan necromancer 02:04:36 it should be like statue tree form and give them a bonus to melee damage 02:05:26 <10P​leasingFungus> absolutely did not expect controversy 02:05:39 <10P​leasingFungus> that’s what i get for implementing tiles for people! 02:06:41 03dilly02 {GitHub} 07https://github.com/crawl/crawl/pull/1874 * 0.27-a0-894-g82f8d8f: Update crawl-ref/source/dat/des/altar/ecumenical.des 10(36 seconds ago, 1 file, 5+ 6-) 13https://github.com/crawl/crawl/commit/82f8d8f64299 02:09:57 <05k​ate> i'm not a fan of vault renames just generally but i think it's not actually a big problem or anything (was overstating it a bit, sorry!) 02:12:57 <05k​ate> and 8 probably is the better glyph to indicate the gameplay functionality (again not that it super matters for an arrival vault), it'd just be good to fix the general messaging issue for vault renames but that's not new here 02:13:55 <12e​bering> imo trees in any state should be on t and have t-like gameplay functionality 02:14:08 how would that work for stone t though? 02:14:17 it would be weird if they could burn 02:14:24 <12e​bering> we have veto props! 02:14:38 well, but then they don't have t-like functionality 02:15:05 and probably also weird if they can be awakened 02:15:09 as they're no longer "alive" 02:15:13 <12e​bering> ok, whaat I am concerned about is that something gets described as "tree" in the message log but screen-reads under a visual cursor as 8 02:15:33 <12e​bering> this is Not Good for blind players 02:15:38 right, agree the glyph not being t is sort of bad 02:15:55 it could get its own feature type, if that helps at all 02:16:05 adds more code complexity 02:16:22 but we can set a custom glyph with a vault define, right? or can we not 02:16:39 <12e​bering> no I don't think so and therein lies the issue 02:16:41 internally just a granite statue, but with name replace and glyph replace 02:16:42 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-899-ge2d0b17c59 (34) 02:16:55 ah, yeah, in that case perhaps we need a new custom feature if we're to use this 02:17:11 <12e​bering> https://www.quora.com/Can-petrified-wood-burn 02:17:40 ok, right here: "Water can never burn." 02:18:38 controversial. 02:18:38 <05k​ate> not with that attitude it can't 02:19:04 <05k​ate> i also like how "works at Undisclosed Employer" adds a layer of mystique here... 02:19:12 yeah that's good too 02:19:19 <05k​ate> hiding the truth of burnable water at their mysterious job 02:19:23 "I can burn water!", should Azrael, if you manage to confuse him and roll the 1 in 100 monster speech line 02:19:32 *shouts 02:35:50 03ukdong9002 07https://github.com/crawl/crawl/pull/1874 * 0.27-a0-895-g80c16d8: just one ecumenical altar 10(6 minutes ago, 3 files, 15+ 22-) 13https://github.com/crawl/crawl/commit/80c16d8cbf3a 02:36:29 Unstable branch on cbro.berotato.org updated to: 0.27-a0-899-ge2d0b17c59 (34) 02:47:30 03ukdong9002 07https://github.com/crawl/crawl/pull/1874 * 0.27-a0-896-g55a5fa5: removes the unused 10(6 minutes ago, 1 file, 1+ 2-) 13https://github.com/crawl/crawl/commit/55a5fa5069b0 02:53:50 Monster database of master branch on crawl.develz.org updated to: 0.27-a0-899-ge2d0b17c59 03:16:42 03ukdong9002 07https://github.com/crawl/crawl/pull/1874 * 0.27-a0-897-g9c94d58: Now it's Gnrine 10(6 minutes ago, 1 file, 4+ 4-) 13https://github.com/crawl/crawl/commit/9c94d585f87d 03:31:29 Fork (bcrawl) on crawl.kelbi.org updated to: 0.23-a0-4135-g7666618ddd 03:32:00 Fork (bcadrencrawl) on crawl.kelbi.org updated to: 0.03-231-g1b75857816 05:47:32 -!- amalloy is now known as amalloy_ 08:47:15 I have a question about interest_check(_G) in overflow.des. 08:47:24 It appears that this is only used for vaults to specific gods. 08:47:34 Is its purpose to add the temple_overflow_generic_1 tag to vaults if the level builder has chosen it as an overflow, but also permit the vault to be used outside D:3-10? 08:47:50 Is it necessary for overflow vaults that place random altars? These also could be placed for decoration outside D:3-10, after all. 08:48:00 So basically, when do I need to use it, and what does it do? 09:10:31 <12e​bering> It adds tags that allow vaults to specific gods to place outside of the 3-10 range for decoration. Because of the current vault tagging system for overflow temples, the same mechanism can’t be so easily used for generic overflows. 09:11:09 <12e​bering> It has no effect on, and should not be included in generic overflows 09:16:00 Thank you! 09:22:44 PleasingFungus, Guardian Golem is quite good spell on its own - you can just fine use it as a walking grenade. More, in my Dj games I used it 80% of the time for that purpose. 09:42:19 Vault syntax please: I am having trouble placing plants, bushes, and fungi via SUBST. 09:42:19 Here are some sample header lines 09:42:22 SUBST: P : cnvbtwl123 09:42:35 SUBST: Q : cnvbtwl123 09:42:43 MONS: plant / bush / fungus 09:42:52 KMASK: wl = no_monster_gen 09:43:03 KMASK: w = no_pool_fixup 09:43:05 end of code 09:44:09 I used KMASK on wl in case a general TAG was preventing plant placement, even though I don't think the genreic TAG would have prevented placement via map glyph 09:44:44 Comparing with vaults by other authors in overflow.des I cannot find a difference 10:03:13 The vaults that choose 1 2 or 3 place blank floor instead of the monster 10:40:44 <12e​bering> Your MONS line is only declaring one monster entry: “plant / bush / fungus” so when those subst lines roll 2 or 3 they produce nothing 10:40:44 <12e​bering> Also both subst lines are : substitutions, so all instances of P get replaced with the same choice 11:03:21 03PleasingFungus02 07* 0.27-a0-900-g263514a: Revert guardgolem dj restrictions (Yermak) 10(12 minutes ago, 1 file, 0+ 2-) 13https://github.com/crawl/crawl/commit/263514a22351 11:04:02 Thanks ebering. The colon with SUBST is intentional. I see now that the / in the MONS line only defines "1". Looking back I see that the vaults that use this only place "1". 11:05:40 Thus it seems I can get the behavior I want--all P become plants, or all P become bush, or all P become fungus--by having only "1" in the SUBST line and keeping the MONS line as is. The level builder will assign one of the three monsters to the "1" glyph, and the SUBST line may place "1's or not. 11:08:17 <12e​bering> wrong order 11:08:31 <12e​bering> the randomization of the MONS line happens separately for each 1 11:08:39 <12e​bering> to get what you want you need to replace the / with , 11:08:43 <12e​bering> or simply have separate mons lines 11:13:33 04Build failed for 08master @ 263514a2 06https://github.com/crawl/crawl/actions/runs/719543527 11:16:55 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-900-g263514a223 (34) 11:22:17 hm, from that build error my guess is that pip has fully dropped support for py27 and if we want to continue using that test we will need to pin an older version of pip somehow in actions 11:28:24 I changed the / to , in the MONS line, and also made three MONS lines. This vault consistently places as an empty room: https://pastebin.com/mqKELRCL 11:29:27 The KMASKs are still there because changing the p and q lines is just for debugging this. 11:29:48 I'll include w and l as options once I figure out the MONS line 11:33:12 <12e​bering> did you remember to restart crawl? I added that vault to my local and it places bushes and fungi 11:33:26 03advil02 07* 0.27-a0-901-g8736458: CI: pin a pip version that will work with py27 10(3 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/8736458e1e42 11:45:49 I did restart crawl. I compiled this executable last night after git pull upstream master, git checkout overflows, git rebase master 11:46:52 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-901-g8736458e1e (34) 11:50:49 grunt_temple_overflow_forces_of_nature is also not placing plants, fungi or bushes. So it's in my executable somewhere 11:51:39 I'll try it in my 0.26 install 11:53:31 Hmm, grunt_temple_overflow_forces_of_nature doesn't place any plants in my Linux tiles 0.26.1 either 11:57:34 wow, sastrei's got good trees 12:05:56 looks like this CI fix worked, but lack of pip support may be another death knell for webtiles on py27 12:06:20 MainiacJoe: are you actually going to the vault in wizmode or just looking at the mini map with &{ 12:07:29 I am in wizmode, use &P to place the map, then &{ and Shift-x 12:07:47 and sometimes &G and travel 12:08:16 have you traveled to the vault before concluding there are no plants? 12:09:12 &{ doesn't show plants because they're monsters 12:09:12 Ah. let me do that. It seems obvious now that you mention it. 12:10:00 0.26.1, place grunt... and then travel to it. No plants 12:10:12 now I'll try my dev build 12:11:16 same in my dev build, grunt... places no plants even after travelling to it with autoexplore and not using &{ or shift-x 12:11:48 <08n​icolae> what's the vault code atm 12:12:36 bizzare. I can't replicate this behavior 12:12:41 tried it again in my dev build and did get plants 12:12:47 the grunt vault 12:12:56 let me repeat the test a few times 12:15:03 in grunt_temple_overflow_forces_of_nature it looks to me like everything but fungi can get subst'd away 12:16:07 you're reading it wrong 12:16:19 there's a circle of 1's around the _ which place "fungus / plant /bush" 12:16:29 the 2's become 1's on a coinflip 12:16:34 oh I feel like and idiot. &G to get rid of monsters so I don't have to fight on my travels, was getting rid of the plants, too. When I changed it to "harmful" instead of Enter for default "all", the plants are there 12:16:49 yes that'd do it 12:16:59 fyi, placing with &*L will put the vault right on top of you 12:17:02 er 12:17:03 <08n​icolae> that's why i just &B directly to my vaults, so i don't gotta fight nobody 12:17:05 &L *vaultname 12:17:26 doesn't test how it interacts with the level generator though 12:18:10 ah, yeah 12:18:33 MainiacJoe freezing time can be useful if you want to ignore monsters but not delete them 12:18:46 <08n​icolae> freezing time? tell me more 12:18:59 I also don't know how to freeze time 12:19:38 it's &E 12:19:50 sitting in &? this whole time 12:20:53 yes, &E 12:20:54 just expect messaging to be a bit odd 12:22:59 TIL many things. I have to go to work now. I continue to appreciate your patience and am having a lot of fun building these vaults 12:23:40 have fun! 12:23:43 oh, chanpart 12:23:45 rip 12:49:49 03Nikolai Lavsky02 07https://github.com/crawl/crawl/pull/1870 * 0.27-a0-891-gfb91b7e: Filter consumables on the crawl binary side (advil) 10(9 minutes ago, 5 files, 53+ 147-) 13https://github.com/crawl/crawl/commit/fb91b7eeb80c 13:20:37 Unstable branch on crawl.akrasiac.org updated to: 0.27-a0-901-g8736458 (34) 13:23:52 -!- spicycebolla is now known as spicyCebolla 13:33:10 <03w​heals> there've been a few times that i've tried to track down a bug before i realized that it was just my having forgotten that i stopped time 14:05:48 03Shapermc02 {GitHub} 07https://github.com/crawl/crawl/pull/1868 * 0.27-a0-885-g3653c81: Update crawl-ref/source/dat/des/altar/ecumenical.des 10(42 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/3653c81c43e6 14:11:39 03Shapermc02 {GitHub} 07https://github.com/crawl/crawl/pull/1868 * 0.27-a0-886-g2428b85: Update crawl-ref/source/dat/des/altar/ecumenical.des 10(4 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/2428b8589679 14:25:58 wheals: same 14:26:20 <08n​icolae> i'm going to stop so much time now 14:27:43 <08n​icolae> what's that learn db entry for artifacts with un-apropos names, and can i add to it from discord 15:15:57 03Shapermc02 {GitHub} 07https://github.com/crawl/crawl/pull/1868 * 0.27-a0-887-g0fc070c: Update ecumenical.des 10(4 minutes ago, 1 file, 3+ 3-) 13https://github.com/crawl/crawl/commit/0fc070c33669 17:59:51 <02|​amethyst> @nicolae 17:59:51 <02|​amethyst> ??inapropos randarts 17:59:51 <04C​erebot> inapropos randarts ~ unapropos randarts[1/32]: the hand axe "Hydraslayer" (weapon) {chop, +Inv rElec rF- Dex+3} 17:59:51 <02|​amethyst> I don't think you can add through Cerebot though 18:02:01 lol I just discovered that through 0.5.2 we distributed dos versions 18:05:41 <|amethyst> presumably with a DOS extender? 18:05:41 <|amethyst> since I have a hard time imagining how even old old versions could fit in 640K 18:05:54 <|amethyst> I guess djgpp had its own DOS extended 18:06:03 <|amethyst> s/d$/r 18:11:15 New branch created: pull/1876 (1 commit) 13https://github.com/crawl/crawl/pull/1876 18:11:15 03Aliscans02 07https://github.com/crawl/crawl/pull/1876 * 0.27-a0-902-g7c7ce5e: Remove Maud from montitle.txt. 10(76 minutes ago, 1 file, 0+ 4-) 13https://github.com/crawl/crawl/commit/7c7ce5ecfbc5 18:11:32 no idea, someone in ##crawl was asking about versions before 0.6 so I was just looking at what was in sourceforge 18:11:32 <|amethyst> btw 18:11:32 <|amethyst> ??crawl-ancient 18:11:32 crawl-ancient[1/1]: https://github.com/crawl/crawl-ancient contains 2.72, 4.00b26, {4.1}.2alpha, and {crawl alternative} 18:11:32 yeah, that I know about 18:11:52 <|amethyst> oh, didn't realise that only went back to 1.1 18:12:17 <|amethyst> I guess someone needs to do more archaeolog and git surgery 18:12:25 <|amethyst> s/olog/ology 18:15:56 <|amethyst> ohhh 18:16:17 <|amethyst> *stone soup* 0.5.2 supported DOS? even more wow than I was thinking 18:16:28 <|amethyst> I was thinking like 1990s Linley version 18:17:05 New branch created: pull/1877 (1 commit) 13https://github.com/crawl/crawl/pull/1877 18:17:05 03Aliscans02 07https://github.com/crawl/crawl/pull/1877 * 0.27-a0-902-g362300e: Let the player create both Maggie and Margery in wizard mode. 10(78 minutes ago, 6 files, 25+ 29-) 13https://github.com/crawl/crawl/commit/362300e8813a 18:23:13 Unstable branch on underhound.eu updated to: 0.27-a0-901-g8736458e1e (34) 18:25:09 <05k​ate> hm, is it feasible to remove those games/milestones from the sequell DB, for that player who got cerebot muted just now? (over in the roguelikes discord, reporting a gkill on a playername that's a racial slur, for context) 18:26:29 <05k​ate> i feel like it maybe came up before when they were banned in the first place but i don't recall the outcome, i guess it's probably not especially easy though from my limited sequell knowledge 18:27:14 Just as well no-one played as "rougelike" in the era of ghost kills 18:41:18 <10P​leasingFungus> https://discord.com/channels/735056636644687913/816151668357201982/819055223707926529 think my q here was similar 18:55:57 <|amethyst> yeah, would do that I I had time 18:56:16 <|amethyst> Gretell has a provision to ban certain names (or regexps), but I never integrated that into scoring 18:56:21 <|amethyst> ??scoring 18:56:21 scoring[1/2]: Source for the CAO scoring pages: https://github.com/crawl/scoring 18:58:14 <|amethyst> Also, unrelated, given CAO's (and other servers') perennial disk space problems, I feel like this is more important now than when I first filed it: https://crawl.develz.org/mantis/view.php?id=10748 18:58:14 <|amethyst> Unless that was fixed at some point when I was keeping less up-to-date, in which case the bug should be closed 19:09:56 I'm not sure about that bug specifically but the behavior on a full disk is pretty weird and non-ideal 19:10:24 scoring has a ban list, is there someone who needs banned? 19:10:25 I'll make cerebot not output that text for now 19:11:29 advil: this was SLURgoku for one of the usual slurs. 19:11:55 already banned 19:12:09 I did every instance of that slur in the db at one point 19:13:21 haven't updated it in a while so there could be new ones 19:13:34 if anyone needs that ban list (e.g. for sequell) lmk 19:13:57 for anyone who has cao access it's at /home/rax/scoring/banned_players.yml 19:14:29 tw for anyone who does 19:14:45 <|amethyst> oh, hadn't realised someone had implemented it 19:16:04 <|amethyst> the Henzell list is /home/henzell/henzell/.badusers 19:17:41 I did it back when I overhauled db importing 19:18:50 hm, probably should run matches against that list 19:34:20 anyone else ever experience slow git log of the crawl repo? 19:34:49 seems to take quite some seconds to formulate the log sometimes, and I'm not sure if there's a setting that can help that 19:37:13 03gammafunk02 07* 0.27-a0-902-g22995d6: Hilbert curve vaults for Spider by nicolae (12539) 10(2 hours ago, 1 file, 437+ 0-) 13https://github.com/crawl/crawl/commit/22995d60733a 19:39:30 <|amethyst> gammafunk: what command are you running exactly? git log -p --stat 123deadbeef..HEAD runs pretty fast for me 19:40:46 <09g​ammafunk> simply git log 19:40:52 <|amethyst> gammafunk: if it's something that applies to all of history, I'm not sure there's much that can be done to speed up going through 62000+ commits other than putting your repo on a ramdisk or SSD or something 19:41:12 <|amethyst> gammafunk: what's your pager? 19:42:06 |amethyst: what seems to happen is that it takes a long time if it hasn't run in a while 19:42:15 <|amethyst> I use view (vim readonly), so that does take a longish time for me, but something like less or more that doesn't wait for the whole file to come in first might be faster 19:42:31 I think I'm using the default page 19:42:34 *pager 19:42:46 it's quite fast after having run once slowly 19:43:43 <|amethyst> that's still about 300 MiB, so I suspect it's just your disk 19:43:43 but fairly often it'll take like 10-20 seconds if it's not been run in a while 19:43:43 gotcha 19:43:43 it is an older machine with not a particularly fast disk 19:43:43 <|amethyst> once it's run once recently, it's in the page cache so will be much faster 19:45:53 |amethyst: is there a way to only look at up to the last N commits that might be faster? 19:46:06 I run git log to see basically the latest one or only a few prior, after all 19:46:41 I could look at HEAD~N..HEAD, but I'm not sure if that's faster or not 19:46:51 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-902-g22995d6073 (34) 20:01:14 <|amethyst> 'git show' will show the latest, and for multiple, HEAD^10..HEAD is usually what I do 20:01:14 <|amethyst> (actually, I have a shell function that does git fetch then takes uses ..HEAD, but that only works once, so it's HEAD^10..HEAD after that) 20:01:57 <|amethyst> HEAD ~10 won't work (unless things have I changed recently-ish), because that means "the tenth parent of the current commit", not the great^8-grand-parent 20:02:52 <|amethyst> i.e. ~n is only really useful for merge commits (when it's invaluable, since ^ follows the chain of first parents) 20:03:56 <|amethyst> HEAD^N..HEAD should be pretty fast, since it only has to load N commits from disk 20:12:54 thanks 20:30:26 never noticed git log slowdowns 20:30:26 it's been a while since I used something that wasn't at least partly ssd though 20:47:57 mine is partly ssd, but not apparently not ssd enough 😫 21:25:10 03kate-02 07* 0.27-a0-903-gc0143cd: Adjust some descriptions 10(24 minutes ago, 2 files, 9+ 9-) 13https://github.com/crawl/crawl/commit/c0143cd1621d 21:25:10 03kate-02 07* 0.27-a0-904-g6cd11ba: Update and extend some duration descriptions 10(23 minutes ago, 2 files, 42+ 37-) 13https://github.com/crawl/crawl/commit/6cd11ba2235c 21:25:10 03kate-02 07* 0.27-a0-905-gfc3203c: Fix webtiles display of defense boosts 10(4 minutes ago, 1 file, 3+ 3-) 13https://github.com/crawl/crawl/commit/fc3203cb9b22 21:31:57 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-905-gfc3203cb9b (34) 21:38:07 03kate-02 07* 0.27-a0-906-g0a00ce8: Update SPWPN_PROTECTION's duration short_name 10(2 minutes ago, 2 files, 2+ 2-) 13https://github.com/crawl/crawl/commit/0a00ce863d88 21:46:50 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-906-g0a00ce863d (34) 22:12:43 I've gotten myself into a git bind. Locally I am in branch overflows. My origin/master on github/com/mainiacjoe/crawl is even with crawl/crawl, but overflows at github is behind. 22:13:50 There is one commit in place from a few days ago at mainiacjoe/overflows with three vaults. I'm trying to commit a further twenty tonight; all 23 are in overflows.des 22:13:56 I am stuck trying to get origin/overflows even with crawl/crawl 22:14:34 git status says my branch has diverged from origins/overflows with 81 and 1 commits each, respectively 22:15:48 I've trying pulling from origin/master while on local overflows, and also pushing from local master to origin/overflows, and neither worked 22:16:50 I made a commit with the twenty new vaults--I think--but the push fails and talks about fast-forward. I did look at git push --help but didn't understand it TBH 22:22:04 git rebase master reports that [local] overflows is up to date 22:24:20 git pull origin complains about my edits to overflows.des and tells me to fix conflicts. I had to track down git merge --abort to get out of that 22:42:01 MainiacJoe: if you're satisfied with the state of origin/overflows, you probably just want to force push: git push --force origin overflows 22:43:04 but when you say you want to get origin/overflows even with crawl/crawl, that's a bit confusing, as it can't be even until there's a merge of your origin/overflows into crawl/crawl 22:44:27 github's overflwos page says, "This branch is 1 commit ahead, 79 commits behind crawl:master." based on your comment does that refer to origin:master? the "crawl" is mainiacjoe/crawl instead of crawl/crawl? 22:44:27 if by even you mean that you just want your origin/overflows to be like your mainiacjoe/overflow, which is a ff on top of crawl/crawl 22:44:47 "ff"? 22:44:51 fast forward 22:45:26 that refers to our repo, crawl/crawl, and how you have your one commit (1 ahead) and we have 79 commits since (your origin/overflows is 79 behind) 22:45:40 tell me more about fast-forward. How could mainiacjoe/overflows be a ff of crawl/crawl if it's 80 commits *behind* 22:46:20 it could or even should be that, depending on how you're trying to work 22:46:25 your work is currently in a PR? 22:47:02 if it's a PR, your origin/overflows will be compared about crawl/crawl in the PR itself on github 22:47:11 my first three vaults are in a PR, that I've set to draft status. I want to add the twenty more vaults to that PR and ask for review 22:47:47 ok, so there'd be two typical ways to make subsequent commits 22:48:55 first is don't worry about our crawl/crawl and don't try to update your maniacjoe/overflows nor your origin/overflows relative to crawl/crawl; the PR will be fine with this 22:48:55 you'd simply make your additional commit, never updating relative our our crawl/master (we were calling it crawl/crawl before, but the relevant branch is actually crawl/master) 22:49:27 second is you'd like to incorporate recent stuff from crawl/crawl, in which case you'll be doing force pushes to your origin/overflows after you've merged in crawl/master stuff to your local maniacjoe/overflows 22:49:35 the PR will be fine with either 22:49:51 the second approach lets you see current stuff we've commited on our side 22:50:07 if you don't care to see that, first approach is good; just ignore our crawl/master 22:50:15 make your local commits, push to origin/overflows 22:50:30 once you start pulling in changes from our crawl/master, you're in scenario 2 22:50:41 can I see the commits I've queued locally? 22:50:54 some of the trunk commits are ebering's overflows changes 22:51:10 not quite sure what you mean by queued 22:51:15 he was working on those at the same time I was working on the first three vaults 22:51:23 the additional commit since you opened the branch/PR? 22:51:45 I did git commit -a tonight on local/overflows, and made a commit msg in my text editor 22:52:03 but I couldn't push it, perhaps because I didn't know about force 22:52:22 well, you can simply do git log 22:52:28 thanks 22:52:34 I don't really recommend -a btw 22:52:37 it's kind of error prone 22:52:53 oh 22:52:59 I see, it's different than git add -a, isn't it 22:53:28 that one might be ok; avoid git add --all 22:53:36 git commit -a is actually in the Git Guide to DCSS 22:53:52 yeah, that's just not one I use, good to know about that actually 22:54:46 I'm scrolling thorugh git log, I see lots of trunk commits, looking for mine 22:54:46 git log --author=MainiacJoe 22:54:46 alternately 22:55:06 yeah I need to do that, I jsut noticied I'm in early March still reading trunk ommits 22:55:36 no result with me as author 22:56:01 because I was on local/master 22:56:16 found it 22:56:32 it's in local/overflows log 22:56:38 yeah 22:56:40 you can do 22:56:43 git log overflows 22:56:52 git log BRANCH, basically 22:57:13 I checkout'd to overflows and then jsut git log 22:58:00 so "git push" with no tags says, "Updates were rejected because the tip of your current branch is behind its remote counterpart." 22:58:49 That was what made me think in the beginning of this chat session that I need to update origin:overflows (origin is mainiacjoe/crawl) 23:00:37 "git push origin/overflows" says, fatal error, does not appear to be a git repository 23:00:45 running that from local/overflows 23:02:24 no, it's: git push origin overflows 23:02:42 and based on what we discussed, probably going to have to be: git push --force origin overflows 23:03:01 but this is assuming that your local overflows is in a good state 23:03:09 didn't work without --force 23:03:14 correct 23:03:16 what's a good state LOL? 23:03:30 a good state is not having bad commits you don't want 23:03:43 and only our commits + your overflow altar commits on top 23:05:18 I'm not actually sure what we recommend people do for staying in sync 23:06:27 presumably just: git pull origin master 23:06:43 git status on local/overflows talks about 81 and 1 commits but then says, nothing to commit, working tree clean. Yet git log overflows --author=MainiacJoe shows the commit I made tonight and the one from last week 23:07:03 that sounds as it should be 23:07:05 er 23:07:07 81 what? 23:07:12 81 commits behind? 23:07:20 and behind what? 23:09:14 git status says: "On branch overflows Your branch and 'origin/overflows' have diverged, and have 81 and 1 different commits each, respectively. (use "git pull" to merge the remote branch into yours) nothing to commit, working tree clean" 23:09:43 My understanding is that origin is github.com/mainiacjoe/crawl 23:10:05 It's in a good state, I want both of my commits 23:10:22 so "git push --force origin overflows" then? 23:11:24 right, I thought you had done said force push already 23:12:18 origin/overflows won't be in sync until you do a force push like that 23:14:19 I chickened out because I didn't understand it. I'll do the force push now 23:15:47 Okay, origin.overflows on github is now two commits ahead of crawl:master 23:16:12 now to look at crawl/crawl/pulls 23:17:51 03MainiacJoe02 07https://github.com/crawl/crawl/pull/1858 * 0.27-a0-907-gbbae4b2: Add three unaligned overflow vaults Simple headers without Lua. Two vaults place two altars, one vault places one altar. 10(7 days ago, 1 file, 60+ 0-) 13https://github.com/crawl/crawl/commit/bbae4b2ac77b 23:17:51 03MainiacJoe02 07https://github.com/crawl/crawl/pull/1858 * 0.27-a0-908-gcf2396b: Add 23 unaligned overflow vaults 10(82 minutes ago, 1 file, 390+ 17-) 13https://github.com/crawl/crawl/commit/cf2396b4ef01 23:18:08 That PR now has two commits in it! I'll edit a header and mark it for review. Thank you for your help. I'm still a bit confused but feel a lot better about it than last week! 23:18:24 no problem 23:54:20 !tell MainiacJoe local branch naming can get confusing, if you have origin/master and upstream/master both tracked locally. i've started calling things origin/main and upstream/master, it helps 23:54:20 spicyCebolla: OK, I'll let mainiacjoe know.