00:19.04 | *** join/#bzflag infobot (ibot@208.53.50.136) |
00:19.04 | *** topic/#bzflag is https://BZFlag.org || http://ohloh.net/p/bzflag || https://bzflag.org/help || Channel Logs: http://infobot.rikers.org/%23bzflag/ || 2.4.14 released! https://forums.bzflag.org/viewtopic.php?f=62&t=19953 |
00:19.04 | *** mode/#bzflag [+v infobot] by ChanServ |
01:44.26 | *** join/#bzflag krushia (~krushia@201-167-222-2-cable.cybercable.net.mx) |
01:46.06 | *** join/#bzflag xfil (~xfil@1.253.25.211) |
01:52.15 | *** join/#bzflag ptx023 (~ptx0@fp9f1c80e6.chbd117.ap.nuro.jp) |
02:07.32 | *** join/#bzflag Guest58147 (~mark-otar@softbank060128167240.bbtec.net) |
02:08.34 | *** join/#bzflag lmartin924 (~lmartin92@41.39.216.157) |
02:28.01 | *** join/#bzflag OvidiuS26 (~OvidiuS@p54073-ipngnfx01osakakita.osaka.ocn.ne.jp) |
02:48.29 | *** join/#bzflag gamma12 (~gamma@62.76.80.21) |
02:58.46 | *** join/#bzflag nOgAnOo (~nOgAnOo@85.195.227.188) |
03:23.01 | *** join/#bzflag zhongfu4 (~zhongfu@110.144.27.242) |
03:42.22 | *** join/#bzflag Henry_Jia14 (~Henry_Jia@210.82.28.41) |
03:53.02 | *** join/#bzflag jorrakay3 (~jorrakay@114.207.75.196) |
03:54.08 | Flash | can someone remove my write access to the master project? I'm too uncertain with git and don't want to screw everything up |
03:56.35 | *** join/#bzflag gildarts_ (~gildarts_@nz1l245.bb60246.ctm.net) |
03:59.19 | *** join/#bzflag Mercster14 (~Mercster@113.160.133.109) |
04:05.44 | *** join/#bzflag sabre104115 (~sabre1041@2804:18:59:8bdc:69ee:f5b7:a703:8231) |
04:18.49 | *** join/#bzflag MuffinMedic8 (~MuffinMed@softbank126114096050.bbtec.net) |
04:18.57 | *** join/#bzflag BurningPrincess1 (~BurningPr@ZP124004.ppp.dion.ne.jp) |
04:22.12 | *** join/#bzflag BenLand10011 (~BenLand10@205.185.223.170) |
04:49.41 | *** join/#bzflag Guest1934 (~Guest1934@191.255.43.216) |
04:50.57 | *** join/#bzflag Spaulding9 (~Spaulding@58.120.147.65) |
05:18.10 | *** join/#bzflag tharkun20 (~tharkun@46.246.123.2) |
05:20.55 | *** join/#bzflag Stryyker9 (~Stryyker@205.185.209.108) |
05:38.50 | Flash | gah ... who has insomnia? |
05:39.55 | allejo | it's not late enough for it to be classifed as insomnia for me |
05:40.13 | Flash | can you help me unscrew git? |
05:40.31 | allejo | i can try |
05:40.34 | allejo | what's up? |
05:40.41 | Flash | I'm trying to sync to the project master |
05:40.53 | Flash | but I'm getting link errors on JeffM's last merge |
05:41.02 | Flash | so I know I'm not sync'd right |
05:41.20 | Flash | I'm fed up with my fork ... thinking I should trash it |
05:42.12 | allejo | hmm ok you're gonna have to elaborate a bit more |
05:42.26 | Flash | so I have a VERY old fork |
05:42.45 | Flash | I (think I) updated it to the project base |
05:43.10 | Flash | I created a pull request and blast007 said to make it against master |
05:43.28 | Flash | I'm having a hard time getting a master sync'd |
05:43.59 | allejo | oh oof just saw your fork |
05:44.12 | Flash | git thinks (I think) it's all good, but I can't build... getting link errors on the buffer management stuff |
05:44.23 | allejo | do you have any other branches or work in your fork? |
05:44.37 | Flash | I have nothing of consequence |
05:44.37 | allejo | or just whatever was in that PR? |
05:44.56 | Flash | 2 files are all that matter; I have them squirreled away |
05:45.26 | allejo | the easiest way would just to make a new fork and then apply your PR as a patch |
05:45.27 | allejo | https://patch-diff.githubusercontent.com/raw/BZFlag-Dev/bzflag/pull/171.patch |
05:45.47 | allejo | or as a diff https://patch-diff.githubusercontent.com/raw/BZFlag-Dev/bzflag/pull/171.diff |
05:46.53 | allejo | oh wait your master branch looks ok on your fork |
05:47.12 | Flash | so it would seem. but it doesn't build |
05:47.38 | allejo | what are the errors you're getting? |
05:48.21 | Flash | they are link errors like "getMessageBuffer" which I know is Jeff's last change |
05:48.36 | allejo | what OS are you building on? |
05:48.45 | Flash | MacOS |
05:49.19 | allejo | ah i just fixed those yesterday in the xcode project |
05:49.20 | Flash | Undefined symbols for architecture x86_64: |
05:49.20 | Flash | <PROTECTED> |
05:49.24 | Flash | for example |
05:49.32 | JeffM | I make no promise about files I added being added to the OS X build |
05:49.47 | JeffM | OS X may just be busted |
05:49.51 | allejo | pull the last three commits from the current master branch |
05:49.54 | Flash | working on it |
05:50.32 | Flash | git rebase upstream/master |
05:50.37 | allejo | jeffm, no worries. someone who works on macos can add them like I did |
05:50.39 | Flash | should bring me up to date, right? |
05:51.02 | allejo | yea I believe that should |
05:51.12 | JeffM | Xml for everyone! |
05:51.12 | Flash | no joy |
05:51.36 | Flash | JeffM: I will believe you when you abandon VS for XEmacs |
05:51.45 | allejo | did you run a `git fetch upstream` before? |
05:51.56 | Flash | I think so |
05:52.12 | JeffM | Why would I use a Mac, they donât support OpenGL |
05:52.25 | Flash | didn't say Mac :) |
05:52.59 | JeffM | Why would I use Linux itâs run by hippies |
05:53.17 | JeffM | Itâs all about bat mobiles |
05:53.56 | Flash | why would I use Windows? Bill Gates has no creativity (but great business sense) |
05:54.37 | JeffM | Why would you think heâs been involved in the OS for the past decade? |
05:54.59 | JeffM | List like Linux, always outdated information ;) |
05:55.23 | Flash | Windows ... put crap on everyone's desktop and update later |
05:55.26 | Flash | (with more crap) |
05:55.41 | JeffM | I do try to maintain the makefiles for stuff I add |
05:55.47 | JeffM | I sort of get how they work |
05:56.14 | JeffM | I have no way to update or test Xcode |
05:56.15 | Flash | I'm more and more enamored of CMake ... much simpler than other portable frameworks |
05:56.25 | JeffM | Clarke is ok |
05:56.35 | JeffM | When itâs not built up horribly |
05:56.38 | Flash | Clarke? |
05:56.42 | JeffM | Cmake |
05:56.49 | JeffM | Apple autocorrect |
05:56.50 | Flash | autocomplete FTW |
05:57.47 | JeffM | Iâve seen some messed up dependency stuff with cmake, but I donât think thatâs cmakeâs fualt |
05:57.58 | Flash | allejo: ... JeffM is off the hook. Now I have "ShotList" undefines in links |
05:58.18 | JeffM | Oh I made that too ;) |
05:58.31 | Flash | ~doh |
05:58.31 | infobot | from memory, doh is what homer simpson says when sid crashes |
05:58.44 | allejo | are you building the client too? I think I only updated the bzfs target. probably should try building the client |
05:58.50 | Flash | lol |
05:59.00 | Flash | I open the project and hit cmd-B |
06:00.09 | allejo | upper left-ish should have a âBZFlagâ dropdown that you can switch your targets |
06:00.25 | Flash | that's a punt |
06:00.28 | JeffM | Shot list is a new file in the client |
06:01.01 | allejo | there ya go. yea I forgot to test the client build. will check after I finish preparing some food |
06:01.47 | Flash | yah ... it's the client |
06:02.33 | JeffM | Just add the file |
06:03.07 | Flash | thinking about it ... don't mistake me for a Mac developer... Solaris FTW |
06:03.34 | JeffM | I believe you just add it to the project |
06:03.39 | JeffM | With some clicking |
06:03.45 | JeffM | And 100$ |
06:03.46 | Flash | looking for it |
06:05.34 | JeffM | My guess is there is a + icon somewhere |
06:05.36 | Flash | where is the shot list |
06:06.45 | JeffM | Should be in src bzflag I think |
06:06.56 | Flash | found it |
06:08.58 | *** join/#bzflag zaratustra15 (~zaratustr@fj008.net220216040.thn.ne.jp) |
06:09.59 | JeffM | Iâm trying to remember if I did any other new files |
06:10.43 | *** join/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-xnaemqbjbjfufhyh) |
06:10.44 | BZnotify | [13bzflag] 15jwmelto opened pull request #172: fix XCode project (06master...06master) 02https://git.io/fNrlp |
06:10.44 | *** part/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-xnaemqbjbjfufhyh) |
06:10.59 | Flash | that builds |
06:12.02 | allejo | JeffM: git diff --name-status 2.4..master | grep ^A |
06:12.24 | JeffM | That doest work on my phone |
06:12.44 | allejo | and who's fault is that? :p |
06:12.44 | JeffM | I wonder how OS X computes that hash |
06:13.09 | Flash | allejo: that command doesn't work for me |
06:13.10 | JeffM | Blast for making his Linux phone take too long to be created |
06:13.37 | allejo | flash, aw what's it throw? |
06:13.52 | Flash | fatal: ambiguous argument '2.4..master': unknown revision or path not in the working tree. |
06:14.25 | JeffM | Oddly that hash on the project is not unique, so I guess we could just hand edit the file. |
06:15.02 | allejo | do you have a 2.4 branch locally in your clone? |
06:15.15 | Flash | yes |
06:15.58 | *** join/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-fivrytmywormjngc) |
06:15.59 | BZnotify | [13bzflag] 15allejo pushed 1 new commit to 06master: 02https://git.io/fNr8T |
06:15.59 | BZnotify | 13bzflag/06master 14b5e50f6 15jwmelto: fix Xcode project (#172)... |
06:15.59 | *** part/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-fivrytmywormjngc) |
06:16.01 | *** join/#bzflag Dwarf23 (~Dwarf@14.40.27.121) |
06:16.52 | *** join/#bzflag Bonn3338 (~Bonn333@fixed-187-189-11-94.totalplay.net) |
06:17.33 | allejo | hmm not sure then why that command doesn't work :/ |
06:17.52 | Flash | what does 2.4..master mean? |
06:19.17 | allejo | the difference between the "2.4" branch and the "master" branch |
06:19.44 | allejo | you could replace them with hashes too |
06:21.20 | *** join/#bzflag Guest89283 (~govg@85.10.51.16) |
06:21.40 | Flash | you sure about that syntax? |
06:21.45 | Flash | <PROTECTED> |
06:21.45 | Flash | <PROTECTED> |
06:21.45 | Flash | <PROTECTED> |
06:23.11 | allejo | https://cl.ly/2s2S453B1E3B |
06:26.23 | Flash | still not clear on the syntax |
06:27.01 | Flash | ok ... got it. I don't have a master branch |
06:27.24 | Flash | I've learned that it's unpleasant to name local branches the same as remote branches |
06:27.33 | allejo | :) |
06:28.43 | allejo | so `--name-status` will display all of the files that have changed between two branches or hashes. so in this case you're doing a diff between the "2.4" branch and "master" so it'll show everything that has changed. iirc the letters are A for addition, D for deletion and M for modified. so run a grep for A |
06:29.03 | Flash | got it |
06:30.33 | allejo | if you do `git diff HEAD@{5}..HEAD`, it'll show you the changes that have happened between 5 commits ago and HEAD (which is the current point in git history) |
06:41.22 | Flash | hmmm. I'm trying to make another trivial pull request, but the XCode project shows difference |
06:41.30 | Flash | even after you merged it |
06:41.58 | allejo | what changes? |
06:42.16 | Flash | all the things you should have committed |
06:43.56 | Flash | github doesn't seem to see the last commit |
06:44.05 | allejo | blah that was my bad. i squashed the commit instead of merging it so that messed with your git history |
06:45.33 | allejo | in the pull request preview, what files does it show have changed? does it conflict? |
06:45.38 | *** join/#bzflag ExeciN1 (~ExeciN@85.10.50.185) |
06:45.58 | *** join/#bzflag node9 (~node9@c-73-15-108-241.hsd1.ca.comcast.net) |
06:46.12 | *** join/#bzflag Void7 (~Void7@2604:a880:1:20::1315:3001) |
06:47.31 | Flash | it has the one file I changed, and the XCode project changes you just merged |
06:49.27 | Flash | I'm sure my git-fu is too weak |
06:50.33 | allejo | save your latest changes in that commit in a text editor or something. in your fork run `git fetch` and then `git reset --hard upstream/master` and then apply your changes and that *should* work |
06:50.50 | allejo | however as a git practice, i'd recommend creating a branch for each PR |
06:51.13 | allejo | that way if a PR is squashed instead of merged like what I did, it wouldn't break your fork |
07:00.55 | *** join/#bzflag ABIX_Adamj (~ABIX_Adam@187.225.119.183) |
07:01.20 | *** join/#bzflag barbietoss (~barbietos@81.171.57.136) |
07:03.37 | *** join/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-scqxcgnycltbqoei) |
07:03.37 | BZnotify | [13bzflag] 15allejo pushed 1 new commit to 06master: 02https://git.io/fNr4H |
07:03.37 | BZnotify | 13bzflag/06master 142d07112 15Vladimir Jimenez: Bring Xcode project truly up to par with VS |
07:03.37 | *** part/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-scqxcgnycltbqoei) |
07:03.44 | *** join/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-yddajtyngtpxktft) |
07:03.44 | BZnotify | [13bzflag] 15jwmelto opened pull request #173: Doc1 (06master...06doc1) 02https://git.io/fNr4Q |
07:03.44 | *** part/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-yddajtyngtpxktft) |
07:04.27 | Flash | yeah, that needs quashing |
07:05.19 | *** join/#bzflag eir25 (~eir@136.32.75.160) |
07:05.56 | *** join/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-sblgozrdbqskcter) |
07:05.56 | BZnotify | [13bzflag] 15allejo pushed 1 new commit to 06master: 02https://git.io/fNr4A |
07:05.56 | BZnotify | 13bzflag/06master 14e9957ce 15jwmelto: Add homebrew to Mac docs for pkg management (#173) |
07:05.56 | *** part/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-sblgozrdbqskcter) |
07:06.20 | allejo | whew |
07:06.21 | allejo | there |
07:06.50 | allejo | mac devs should feel some love with a functional project and nice docs :) |
07:07.21 | Flash | all 3 of us |
07:09.03 | allejo | #macdevsmatter |
07:10.26 | allejo | xcode project should have any new files added since 2.4. genocide and R2 plugins have also been added to the project |
07:12.45 | allejo | goes off to bed |
07:12.58 | Flash | NOW it's time for insomnia |
07:13.37 | *** join/#bzflag A_D23 (~A_D@p83d5c308.tokynt01.ap.so-net.ne.jp) |
07:14.59 | *** join/#bzflag Frogging1015 (~Frogging1@176.50.162.56) |
07:30.07 | *** join/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-atpyppyniazggmgn) |
07:30.07 | BZnotify | [13bzflag] 15jwmelto closed pull request #171: refactor TimeKeeper to use std::chrono (062.4...062.4) 02https://git.io/fN2uH |
07:30.07 | *** part/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-atpyppyniazggmgn) |
07:32.37 | Flash | bother .... github is either stymying me with caches or your change isn't on master |
07:36.17 | Flash | stupid web browsers |
07:42.36 | *** join/#bzflag nikow1 (~nikow@206.214.8.175) |
07:44.56 | *** join/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-cwbvozponxvuweaq) |
07:44.56 | BZnotify | [13bzflag] 15jwmelto opened pull request #174: refactor TimeKeeper to use std::chrono (06master...06master) 02https://git.io/fNr0f |
07:44.56 | *** part/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-cwbvozponxvuweaq) |
07:59.33 | *** join/#bzflag circle (~circle@58.208.203.89) |
08:33.36 | *** join/#bzflag Algernop7 (~Algernop@37.114.133.183) |
08:53.06 | *** join/#bzflag lutoma13 (~lutoma@156.195.220.48) |
09:11.41 | *** join/#bzflag matti25 (~matti@d207-216-141-82.bchsia.telus.net) |
09:28.27 | *** join/#bzflag blast007 (~blast007@bzflag/developer/Blast) |
09:30.55 | *** join/#bzflag blacksyke4 (~blacksyke@81.171.74.128) |
09:41.33 | *** join/#bzflag Guest49296 (~HepaR@softbank126207034131.bbtec.net) |
09:52.51 | *** join/#bzflag pierte (~pierte@KD113150164009.ppp-bb.dion.ne.jp) |
09:58.53 | *** join/#bzflag Bock (~Bock@2800:bf0:9fff:f428:e41:e9ff:fef7:748e) |
10:03.35 | *** join/#bzflag israfel (~israfel@FL1-122-135-5-169.tcg.mesh.ad.jp) |
10:19.00 | *** join/#bzflag jorik0 (~jorik@89.238.150.24) |
10:21.04 | *** join/#bzflag Metacity6 (~Metacity@93.79.251.212) |
10:25.54 | *** join/#bzflag Tourist6 (~Tourist@211.192.229.210) |
11:27.06 | *** join/#bzflag EvanR1 (~EvanR@216.151.180.127) |
11:54.59 | *** join/#bzflag bolt18 (~bolt@197.251.181.134) |
11:59.04 | *** join/#bzflag ExeciN2 (~ExeciN@103.207.11.202) |
12:06.58 | *** join/#bzflag andirc5089 (~andirc508@81.171.52.108) |
12:25.27 | Delusional | Player âcanadaâ is threatening some kind of something after a ban. Not sure what he thinks heâs gonna doâ¦. In the past heâs shown he knows how to get around bans⦠His problem is that he thinks normal lag is a cheat, and is quite vocal about it, harrassing players. |
12:26.09 | Delusional | Donât want to make my problem into your problem, itâs just a headsupp to expect problems from this guy. |
12:27.21 | *** join/#bzflag x49F (~x49F@cpc122490-lee214-2-0-cust78.7-1.cable.virginm.net) |