| 00:30.02 | *** join/#bzflag mahem1 (~beckettsi@ec2-52-5-67-146.compute-1.amazonaws.com) |
| 00:33.50 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 00:39.36 | *** join/#bzflag DTRemenak|RDP (~DTRemenak@2605:e000:141b:40b4:3cc7:3815:d66e:634) |
| 00:39.36 | *** join/#bzflag DTRemenak|RDP (~DTRemenak@about/essy/CrazyCoder/DTRemenak) |
| 00:39.36 | *** mode/#bzflag [+v DTRemenak|RDP] by ChanServ |
| 00:45.19 | Constitution | so another week or two to wrap up our remaining issues before we start our RC releases? |
| 00:45.35 | blast007 | probably |
| 00:51.08 | Constitution | any more crashes, allejo? |
| 01:10.54 | *** join/#bzflag Pimpi_ (~frank@p4FF43433.dip0.t-ipconnect.de) |
| 01:29.56 | blast007 | hmm.. yeah.. think I'll use the subtree method.. when I try to checkout a specific tag for glew, for instance, it's showing there are 'uncommited changes' in that submodule when I try to commit the dependencies repo :/ and you would also need git to use the .zip or .tar packages that github generates to actually use it |
| 01:41.52 | *** join/#bzflag Constitution (~josh@bzflag/developer/Constitution) |
| 02:24.47 | allejo | blast007, could that be because you possibly make some changes to the submodule? |
| 02:25.49 | blast007 | I just did a 'git submodule add', cd'ed into that directory, and did a 'git checkout TagNameHere' |
| 02:36.58 | allejo | when you did status what shows up? it may be because of the change of tag? |
| 02:38.16 | blast007 | dunno, already deleted it |
| 02:38.39 | blast007 | doesn't really matter though |
| 02:39.19 | blast007 | the show stopper is that the github generated source packages for it don't contain the third party code (requires git to pull the third party code) |
| 02:39.47 | *** join/#bzflag rob1n (Nomsayinth@unaffiliated/rob1n) |
| 02:42.32 | allejo | ahh |
| 02:57.06 | BulletCatcher | The uncommitted changes I saw were due to CRLF/LF differences. |
| 02:57.07 | BulletCatcher | I didn't investigate further. |
| 03:00.47 | blast007 | ah, could be |
| 07:40.37 | *** join/#bzflag BZnotify (~BZnotify@192.30.252.45) |
| 07:40.37 | BZnotify | [13bzflag] 15macsforme pushed 1 new commit to 062.4: 02http://git.io/vtQ4z |
| 07:40.37 | BZnotify | 13bzflag/062.4 14ca43b49 15Joshua Bodine: Corrected URL for c-ares web site. |
| 07:40.37 | *** part/#bzflag BZnotify (~BZnotify@192.30.252.45) |
| 08:14.28 | *** join/#bzflag zuii (~akos@BC06BF93.catv.pool.telekom.hu) |
| 08:32.26 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 08:59.55 | *** join/#bzflag BZnotify (~BZnotify@192.30.252.41) |
| 08:59.55 | BZnotify | [13bzflag] 15macsforme pushed 1 new commit to 062.4: 02http://git.io/vtQHS |
| 08:59.55 | BZnotify | 13bzflag/062.4 14f1498d5 15Joshua Bodine: Fixed a few Xcode deployment targets so they're all for 10.7. |
| 08:59.55 | *** part/#bzflag BZnotify (~BZnotify@192.30.252.41) |
| 10:08.00 | *** join/#bzflag Delusional (~Delusiona@unaffiliated/delusional) |
| 10:24.33 | *** join/#bzflag ukiki (~ukiki_@99-29-152-121.lightspeed.bcvloh.sbcglobal.net) |
| 12:21.53 | *** join/#bzflag dngor (~abuse@p3m/dngor) |
| 12:51.15 | *** join/#bzflag TyroneFHornigh (~dbw@108-197-33-160.lightspeed.sndgca.sbcglobal.net) |
| 13:11.44 | *** join/#bzflag ukiki (~ukiki_@99-29-152-121.lightspeed.bcvloh.sbcglobal.net) |
| 14:19.52 | *** join/#bzflag ukiki (~ukiki_@99-29-152-121.lightspeed.bcvloh.sbcglobal.net) |
| 14:38.07 | *** join/#bzflag nitroxis_ (n@nxs.re) |
| 14:46.30 | *** join/#bzflag brad` (~brad@unaffiliated/brad) |
| 14:48.12 | *** join/#bzflag EvilJStoker (jstoker@unaffiliated/jstoker) |
| 14:53.33 | *** join/#bzflag dcat (~dcat@c-98-244-106-246.hsd1.va.comcast.net) |
| 15:07.34 | *** join/#bzflag Cobra_Fast (~coprah@wtwrp.de) |
| 15:07.36 | *** join/#bzflag echelon (~echelon@bzflag/player/echelon) |
| 15:17.59 | *** join/#bzflag Shuist (~Shuist@ppp203-122-213-220.static.internode.on.net) |
| 15:26.31 | *** join/#bzflag BZnotify (~BZnotify@192.30.252.41) |
| 15:26.32 | BZnotify | [13bzflag] 15JMakey 04force-pushed 062.4 from 14f1498d5 to 14aede1a9: 02http://git.io/vtdyu |
| 15:26.32 | *** part/#bzflag BZnotify (~BZnotify@192.30.252.41) |
| 15:27.45 | blast007 | force pushed? |
| 15:27.50 | BulletCatcher | Arg, I think I undid Constitution's last couple of changes. |
| 15:28.05 | BulletCatcher | It wasn't on purpose. |
| 15:28.10 | blast007 | :) |
| 15:28.25 | BulletCatcher | If you already pulled, you could push them back again. |
| 15:29.05 | blast007 | dunno if I've pulled in the last few days |
| 15:29.37 | blast007 | what were you pushing? |
| 15:29.54 | BulletCatcher | I meant to only push a change on the master branch. |
| 15:30.05 | blast007 | ah |
| 15:31.35 | BulletCatcher | Constitution should be able to just re-push and it will be fine. |
| 15:31.35 | blast007 | yup |
| 15:31.59 | BulletCatcher | Note to self: always pull before pushing. |
| 15:32.28 | blast007 | though I do still see the commits if I go to them directly |
| 15:32.51 | BulletCatcher | Where do you see them? |
| 15:32.58 | blast007 | https://github.com/BZFlag-Dev/bzflag/commit/ca43b493ad233df7f60e33690a78594909c95b74 |
| 15:33.01 | blast007 | https://github.com/BZFlag-Dev/bzflag/commit/f1498d586153c7aa6e7e294f2a06b797be4f6999 |
| 15:33.20 | blast007 | (grabbed from the URL in the commit messages from earlier) |
| 15:33.22 | blast007 | URLs* |
| 15:34.29 | BulletCatcher | They're still in the repo, it's just the 2.4 branch pointer that was set back. |
| 15:35.08 | blast007 | k |
| 15:35.25 | BulletCatcher | There's probably a way to recover, but I need to leave now. |
| 15:37.50 | BulletCatcher | Anyone (allejo, perhaps) who pulled within the last 6 hours should be able to repush. |
| 15:39.10 | blast007 | I should probably set up some automated backup snapshot system for our github repos. |
| 15:44.10 | *** join/#bzflag Pimpinella (~frank@p4FF43433.dip0.t-ipconnect.de) |
| 15:49.01 | *** join/#bzflag Pimpinella (~frank@p4FF43433.dip0.t-ipconnect.de) |
| 16:04.11 | *** join/#bzflag Pimpinella (~frank@p4FF43433.dip0.t-ipconnect.de) |
| 16:20.05 | *** join/#bzflag joevano (~joevano@bzflag/developer/JoeVano) |
| 16:20.05 | *** mode/#bzflag [+v joevano] by ChanServ |
| 16:21.06 | the_map | force pushed? |
| 16:21.16 | the_map | "The force is strong with this one." |
| 16:23.10 | the_map | he should just wave his hand at the computer and tell it it wants to take care of the commits |
| 16:37.05 | blast007 | *waves hand* "You want to go home and repush those commits" |
| 16:41.55 | the_map | what do you think you are, some sort of jedi? |
| 16:43.21 | blast007 | *waves hand* "I'm a Jedi Master" |
| 16:43.51 | the_map | you have no power here, Gandalf the Grey |
| 16:44.23 | the_map | but may the odds be every in your favor anyway |
| 16:44.28 | the_map | *ever |
| 17:47.50 | *** join/#bzflag TimRiker (~TimRiker@bzflag/projectlead/TimRiker) |
| 17:47.50 | *** mode/#bzflag [+o TimRiker] by ChanServ |
| 18:26.35 | *** join/#bzflag zuii (~akos@BC06BF93.catv.pool.telekom.hu) |
| 19:38.01 | *** join/#bzflag [Gort] (~gort@82-69-126-225.dsl.in-addr.zen.co.uk) |
| 19:38.01 | *** join/#bzflag [Gort] (~gort@unaffiliated/gort/x-9231432) |
| 20:08.31 | khazhyk | force pushes were fun when the default behavior was to force push all branches if you just did `git push --force` |
| 20:08.57 | khazhyk | roll back master a few weeks when force pushing another branch :D |
| 21:06.34 | *** join/#bzflag [Gort] (~gort@unaffiliated/gort/x-9231432) |
| 22:23.14 | *** join/#bzflag zuii (~akos@BC06BF93.catv.pool.telekom.hu) |
| 22:37.28 | *** join/#bzflag [Gort] (~gort@82-69-126-225.dsl.in-addr.zen.co.uk) |
| 22:37.28 | *** join/#bzflag [Gort] (~gort@unaffiliated/gort/x-9231432) |
| 23:18.17 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |