| 02:25.58 | *** join/#bzflag EvilJStoker (jstoker@unaffiliated/jstoker) |
| 02:27.05 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 03:04.32 | *** join/#bzflag zuii (~akos@BC06BD4B.catv.pool.telekom.hu) |
| 04:18.54 | BulletCatcher | "branch_note" is the name of the new single-commit branch, Constitution. |
| 04:19.57 | BulletCatcher | The import-6 repo is as clean as I think I can get it. |
| 04:21.05 | BulletCatcher | Every branch where it makes the slightest sense to do so has been merged back into the mainline to declutter the lists of branches and tags. |
| 04:24.28 | BulletCatcher | A typical example of that is the short-lived 2_4_OSX_Lion_Rebuild_branch branch, for which I synthesized a Git merge back to trunk. |
| 05:11.20 | *** join/#bzflag zuii (~akos@BC06BD4B.catv.pool.telekom.hu) |
| 05:25.35 | Constitution | you merged it back into trunk? that branch was entirely superseded by different work |
| 05:28.31 | Constitution | unless I'm misunderstanding what you're saying, but I don't see a branch or tag for that project in any of the current repos |
| 05:30.46 | *** join/#bzflag Pimpinella (~frank@gondolin.pimpi.org) |
| 05:31.22 | *** join/#bzflag zuii (~akos@BC06BD4B.catv.pool.telekom.hu) |
| 05:47.15 | BulletCatcher | I merged it in a manner that discarded all of its changes. |
| 05:48.02 | BulletCatcher | Eliminating the branch/tag for it is the point of that merge. |
| 05:48.48 | BulletCatcher | See commit 9a7726ddc137a01aa97b7c7383335fa05224d937 in the import-6 repo. |
| 05:50.50 | BulletCatcher | Using a Git viewer that shows branch graphs (and I don't mean GitHub's web interface) is the best way to understand what happened. |
| 05:53.49 | BulletCatcher | "git log --oneline --graph ced3353..9a7726d" draws an ASCII graph. |
| 14:56.41 | *** join/#bzflag infobot (ibot@rikers.org) |
| 14:56.41 | *** topic/#bzflag is http://BZFlag.org || https://www.ohloh.net/p/bzflag || http://wiki.BZFlag.org/Getting_Help || Channel Logs: http://ibot.rikers.org/%23bzflag/ || 2.4.2 Current version http://goo.gl/PI9KFD |
| 14:56.41 | *** mode/#bzflag [+v infobot] by ChanServ |
| 15:16.52 | blast007 | BulletCatcher: in the bzflag-import-6 repo, is there anything in 1.7_archive_1 or 1.7_archive_2 tags that isn't in the 1.7 branch? |
| 15:19.34 | blast007 | If I'm looking at it right, 'git log --oneline --graph d174b2a...a1951d0' looks like it is all merged back into master (assuming the line in the first column is master), and picking out a commit from the middle (5ca3cc5) on github shows that it is part of master and various tags (but not other branches? is that normal?) |
| 15:20.30 | blast007 | (and that git log was based on commit ids from 1.7_archive_2's latest and the parent of the entire repo) |
| 15:22.24 | blast007 | sounded like 1.7_archive_2 was tied to a mistakenly created 'bzflag' branch back in CVS days |
| 15:37.42 | *** join/#bzflag bzbugsy (bzbugsy@2600:3c02::f03c:91ff:fe6e:ddc7) |
| 15:37.42 | *** join/#bzflag bzbugsy (bzbugsy@unaffiliated/bzbugsy) |
| 15:38.00 | BulletCatcher | Yes, 1.7_archive_2 in Git is the "bzflag" branch from Subversion/CVS. |
| 15:38.12 | BulletCatcher | Similarly, 1.7_archive_1 is v1_7branch in Subversion. |
| 15:38.13 | BulletCatcher | Tim is the only one who ever committed to them, and basically he used them as places to park stuff. |
| 15:38.13 | BulletCatcher | I include them in Git for completeness. |
| 15:40.25 | blast007 | okay |
| 15:44.50 | BulletCatcher | You have to look carefully to know which line goes with which branch in "git log --graph" output. |
| 15:44.51 | BulletCatcher | In the case of d174b2a...a1951d0, the merge near the top was from the mainline onto the "bzflag" branch rather than the other way around. |
| 15:45.45 | blast007 | ah |
| 15:48.08 | BulletCatcher | In the output of "git show --pretty=raw f73c8f7 | head", the first parent listed (a141550) is the "onto" one. |
| 15:55.57 | BulletCatcher | The branch containing the "onto" parent includes the merge commit, and the non-onto parent's branch does not include the merge. |
| 16:23.41 | *** join/#bzflag bzbugsy (bzbugsy@2600:3c02::f03c:91ff:fe6e:ddc7) |
| 16:23.41 | *** join/#bzflag bzbugsy (bzbugsy@unaffiliated/bzbugsy) |
| 16:52.27 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 19:17.33 | *** join/#bzflag zuii (~akos@BC06BD4B.catv.pool.telekom.hu) |
| 20:28.32 | *** join/#bzflag swigg (~Paul@bzflag/player/Swigg) |
| 21:34.45 | *** join/#bzflag MonsieurApple (~MonsieurA@unaffiliated/mrapple) |
| 21:34.45 | *** join/#bzflag bier (~bier@helixnetworks.de) |
| 21:34.45 | *** join/#bzflag Guest69227 (~trepan@s72-38-252-50.static.datacom.cgocable.net) |
| 21:34.45 | *** join/#bzflag BulletCatcher (~bc@bzflag/developer/BulletCatcher) |
| 21:34.45 | *** join/#bzflag disco- (~disco@unaffiliated/disco-) |
| 21:34.45 | *** join/#bzflag mdskpr_ (~quassel@li59-174.members.linode.com) |
| 21:34.45 | *** join/#bzflag mdskpr (~quassel@li59-174.members.linode.com) |
| 21:34.45 | *** join/#bzflag allejo (~allejo@unaffiliated/allejo) |
| 21:34.45 | *** join/#bzflag Flash (~flash@bzflag/developer/Flash) |
| 21:34.45 | *** join/#bzflag Delusional (~Delusiona@unaffiliated/delusional) |
| 21:34.45 | *** join/#bzflag blast007 (~blast007@bzflag/developer/Blast) |
| 21:34.45 | *** join/#bzflag khonkhortisan (~Khonkhort@c-24-18-42-215.hsd1.wa.comcast.net) |
| 21:34.45 | *** join/#bzflag L4m3r (~l4m3r@bzflag/developer/L4m3r) |
| 21:34.45 | *** mode/#bzflag [+v L4m3r] by verne.freenode.net |
| 21:37.37 | *** join/#bzflag cods (~fred@rsbac/developer/cods) |
| 21:42.51 | *** join/#bzflag cods (~fred@rsbac/developer/cods) |
| 21:42.51 | *** join/#bzflag L4m3r (~l4m3r@bzflag/developer/L4m3r) |
| 21:42.51 | *** join/#bzflag khonkhortisan (~Khonkhort@c-24-18-42-215.hsd1.wa.comcast.net) |
| 21:42.51 | *** join/#bzflag blast007 (~blast007@bzflag/developer/Blast) |
| 21:42.51 | *** join/#bzflag Delusional (~Delusiona@unaffiliated/delusional) |
| 21:42.51 | *** join/#bzflag Flash (~flash@bzflag/developer/Flash) |
| 21:42.51 | *** join/#bzflag allejo (~allejo@unaffiliated/allejo) |
| 21:42.51 | *** join/#bzflag mdskpr (~quassel@li59-174.members.linode.com) |
| 21:42.51 | *** join/#bzflag mdskpr_ (~quassel@li59-174.members.linode.com) |
| 21:42.51 | *** join/#bzflag disco- (~disco@unaffiliated/disco-) |
| 21:42.51 | *** join/#bzflag BulletCatcher (~bc@bzflag/developer/BulletCatcher) |
| 21:42.51 | *** join/#bzflag Guest69227 (~trepan@s72-38-252-50.static.datacom.cgocable.net) |
| 21:42.51 | *** join/#bzflag bier (~bier@helixnetworks.de) |
| 21:42.51 | *** join/#bzflag MonsieurApple (~MonsieurA@unaffiliated/mrapple) |
| 21:42.51 | *** join/#bzflag zuii (~akos@BC06BD4B.catv.pool.telekom.hu) |
| 21:42.51 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 21:42.51 | *** join/#bzflag bzbugsy (bzbugsy@unaffiliated/bzbugsy) |
| 21:42.51 | *** join/#bzflag Pimpinella (~frank@gondolin.pimpi.org) |
| 21:42.51 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 21:42.51 | *** join/#bzflag EvilJStoker (jstoker@unaffiliated/jstoker) |
| 21:42.51 | *** join/#bzflag brad (~brad@unaffiliated/brad) |
| 21:42.51 | *** join/#bzflag FastLizard4 (fastlizard@wikipedia/pdpc.active.FastLizard4) |
| 21:42.52 | *** join/#bzflag Notify (~notify@66-118-151-70.static.sagonet.net) |
| 21:42.52 | *** join/#bzflag Kaelten (Kaelten@WoWUIDev/WoWAce/WoWIFA/CurseStaff/kaelten) |
| 21:42.52 | *** join/#bzflag WarPig (~WarPig@bzflag/player/WarPig) |
| 21:42.52 | *** join/#bzflag swigg (~Paul@bzflag/player/Swigg) |
| 21:42.52 | *** join/#bzflag dngor (~abuse@p3m/dngor) |
| 21:42.52 | *** join/#bzflag DTRemenak (~DTRemenak@about/essy/CrazyCoder/DTRemenak) |
| 21:42.52 | *** join/#bzflag joevano (~joevano@bzflag/developer/JoeVano) |
| 21:42.52 | *** join/#bzflag AAA_awright (~aaa@2607:5300:60:7d4::1) |
| 21:42.52 | *** join/#bzflag Constitution (~josh@bzflag/developer/Constitution) |
| 21:42.52 | *** join/#bzflag JPT (~jpt@mail.jpt.lu) |
| 21:42.52 | *** join/#bzflag kierra (~quassel@unaffiliated/kierra) |
| 21:42.52 | *** join/#bzflag nitroxis (~n@wtwrp.de) |
| 21:42.52 | *** join/#bzflag Chestal (~thilo@vmax.unix-ag.uni-siegen.de) |
| 21:42.52 | *** mode/#bzflag [+vvvo L4m3r DTRemenak joevano Chestal] by verne.freenode.net |
| 21:42.52 | *** join/#bzflag dcat (~dcat@c-98-244-106-246.hsd1.va.comcast.net) |
| 21:42.52 | *** join/#bzflag catay (~smertens@valyria.catay.be) |
| 21:42.52 | *** join/#bzflag khazhyk (~khazhyk@unaffiliated/khazhyk) |
| 21:42.52 | *** join/#bzflag plastix- (~plastix@107.170.226.100) |
| 21:42.52 | *** join/#bzflag TyroneFHornigh (~dbw@108-197-33-160.lightspeed.sndgca.sbcglobal.net) |
| 21:42.52 | *** join/#bzflag Gnurdux (~Michael@c-24-128-51-69.hsd1.ma.comcast.net) |
| 21:42.52 | *** join/#bzflag ukiki (~ukiki_@99-29-152-121.lightspeed.bcvloh.sbcglobal.net) |
| 21:43.00 | *** join/#bzflag brlcad (~sean@66-118-151-70.static.sagonet.net) |
| 21:43.00 | *** join/#bzflag Cobra_Fast (~coprah@wtwrp.de) |
| 21:43.00 | *** join/#bzflag ChanServ (ChanServ@services.) |
| 21:43.00 | *** join/#bzflag rodgort (~rodgort@192.241.198.49) |
| 21:43.00 | *** mode/#bzflag [+o ChanServ] by verne.freenode.net |
| 21:43.00 | *** join/#bzflag tw1sted (~tw1sted@unaffiliated/tw1sted) |
| 21:43.00 | *** join/#bzflag alezakos (~kongr45gp@unaffiliated/alezakos) |
| 21:43.00 | *** join/#bzflag ruskie (ruskie@sourcemage/mage/ruskie) |
| 21:43.59 | *** join/#bzflag Pimpinella (~frank@gondolin.pimpi.org) |
| 21:43.59 | *** join/#bzflag EvilJStoker (jstoker@unaffiliated/jstoker) |
| 21:43.59 | *** join/#bzflag joevano (~joevano@bzflag/developer/JoeVano) |
| 21:43.59 | *** join/#bzflag dcat (~dcat@c-98-244-106-246.hsd1.va.comcast.net) |
| 21:44.00 | *** mode/#bzflag [+v joevano] by verne.freenode.net |
| 21:50.34 | *** join/#bzflag bzbugsy (bzbugsy@unaffiliated/bzbugsy) |
| 21:50.34 | *** join/#bzflag brad (~brad@unaffiliated/brad) |
| 21:50.34 | *** join/#bzflag FastLizard4 (fastlizard@wikipedia/pdpc.active.FastLizard4) |
| 21:50.34 | *** join/#bzflag Kaelten (Kaelten@WoWUIDev/WoWAce/WoWIFA/CurseStaff/kaelten) |
| 21:50.34 | *** join/#bzflag AAA_awright (~aaa@2607:5300:60:7d4::1) |
| 21:50.34 | *** join/#bzflag Cobra_Fast (~coprah@wtwrp.de) |
| 21:52.48 | *** join/#bzflag nitroxis (~n@wtwrp.de) |
| 21:53.52 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 21:53.52 | *** join/#bzflag WarPig (~WarPig@bzflag/player/WarPig) |
| 21:53.52 | *** join/#bzflag DTRemenak (~DTRemenak@about/essy/CrazyCoder/DTRemenak) |
| 21:53.52 | *** join/#bzflag tw1sted (~tw1sted@unaffiliated/tw1sted) |
| 21:53.52 | *** mode/#bzflag [+v DTRemenak] by verne.freenode.net |
| 21:54.24 | *** join/#bzflag JPT_ (~jpt@mail.jpt.lu) |
| 21:54.36 | *** join/#bzflag rodgort (~rodgort@192.241.198.49) |
| 21:54.36 | *** join/#bzflag alezakos (~kongr45gp@unaffiliated/alezakos) |
| 21:54.36 | *** join/#bzflag ruskie (ruskie@sourcemage/mage/ruskie) |
| 21:55.24 | *** join/#bzflag Constitution (~josh@bzflag/developer/Constitution) |
| 21:55.24 | *** join/#bzflag JPT (~jpt@mail.jpt.lu) |
| 21:55.24 | *** join/#bzflag catay (~smertens@valyria.catay.be) |
| 21:59.30 | *** join/#bzflag zuii (~akos@BC06BD4B.catv.pool.telekom.hu) |
| 21:59.30 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 21:59.30 | *** join/#bzflag Notify (~notify@66-118-151-70.static.sagonet.net) |
| 21:59.30 | *** join/#bzflag kierra (~quassel@unaffiliated/kierra) |
| 21:59.30 | *** join/#bzflag Chestal (~thilo@vmax.unix-ag.uni-siegen.de) |
| 21:59.30 | *** join/#bzflag khazhyk (~khazhyk@unaffiliated/khazhyk) |
| 21:59.30 | *** join/#bzflag TyroneFHornigh (~dbw@108-197-33-160.lightspeed.sndgca.sbcglobal.net) |
| 21:59.30 | *** join/#bzflag Gnurdux (~Michael@c-24-128-51-69.hsd1.ma.comcast.net) |
| 21:59.30 | *** join/#bzflag ukiki (~ukiki_@99-29-152-121.lightspeed.bcvloh.sbcglobal.net) |
| 21:59.30 | *** mode/#bzflag [+o Chestal] by verne.freenode.net |
| 22:06.14 | *** join/#bzflag bzbugsy (bzbugsy@unaffiliated/bzbugsy) |
| 22:06.14 | *** join/#bzflag brad (~brad@unaffiliated/brad) |
| 22:06.14 | *** join/#bzflag FastLizard4 (fastlizard@wikipedia/pdpc.active.FastLizard4) |
| 22:06.14 | *** join/#bzflag Kaelten (Kaelten@WoWUIDev/WoWAce/WoWIFA/CurseStaff/kaelten) |
| 22:06.14 | *** join/#bzflag AAA_awright (~aaa@2607:5300:60:7d4::1) |
| 22:06.14 | *** join/#bzflag Cobra_Fast (~coprah@wtwrp.de) |
| 22:24.30 | *** join/#bzflag zuii (~akos@BC06BD4B.catv.pool.telekom.hu) |
| 22:35.26 | blast007 | netsplit ahoy! |
| 22:35.47 | *** mode/#bzflag [+o blast007] by ChanServ |
| 22:35.51 | *** mode/#bzflag [-z] by blast007 |
| 22:35.54 | *** mode/#bzflag [-o blast007] by blast007 |
| 22:40.43 | *** join/#bzflag bzbugsy (bzbugsy@2600:3c02::f03c:91ff:fe6e:ddc7) |
| 22:40.43 | *** join/#bzflag bzbugsy (bzbugsy@unaffiliated/bzbugsy) |