| 00:01.47 | Zealin | hmhm |
| 00:01.51 | Zealin | anyone awake? |
| 01:09.47 | Repo | [RoM] 10stopwatch: 03Alleris2_0 * r2 / (25 files in 3 directories): Initial Commit |
| 01:11.16 | Repo | [RoM] 10stopwatch: 03Alleris2_0 04v1.00 * r3 : Initial Release |
| 01:54.23 | *** join/#curseforge Gweniver (n=Gweniver@c-98-240-201-24.hsd1.mn.comcast.net) |
| 02:16.51 | *** join/#curseforge [1]Archarodim (i=HydraIRC@lev92-4-88-164-134-95.fbx.proxad.net) |
| 02:44.26 | *** join/#curseforge sylvanaar (n=sylvanaa@unaffiliated/sylvanaar) |
| 02:47.58 | Repo | [WoW] New addon: http://wow.curseforge.com/addons/noflash/. NoFlash. 42kbdnd (Manager/Author). Approved by Torhal. |
| 02:48.03 | Repo | [RoM] New addon: http://rom.curseforge.com/addons/stopwatch/. StopWatch. Alleris2_0 (Manager/Author). Approved by Torhal. |
| 02:48.10 | Repo | [WAR] New addon: http://war.curseforge.com/addons/warboard_togglerbusted/. WarBoard_TogglerBusted. computerpunk (Manager/Author). Approved by Torhal. |
| 02:48.16 | Repo | [WoW] New addon: http://wow.curseforge.com/addons/lootfast/. LootFast. 42kbdnd (Manager/Author). Approved by Torhal. |
| 02:48.21 | Repo | [RoM] New addon: http://rom.curseforge.com/addons/plantation/. Plantation. Alleris2_0 (Manager/Author). Approved by Torhal. |
| 02:53.42 | *** join/#curseforge sylvanaar (n=sylvanaa@unaffiliated/sylvanaar) |
| 03:20.29 | Repo | [WoW] 10gladius: 03kremonted 07master * v1.0.1-6-g710b4e1 /: [+2 commits] |
| 03:20.31 | Repo | 710b4e1: Merge branch 'master' of git@git.curseforge.net:wow/gladius/mainline |
| 03:20.34 | Repo | b08cd79: * Added defensive turtling abilities to auralist at min priority |
| 03:24.18 | *** join/#curseforge kremonte (n=Dan@ool-18b8808d.dyn.optonline.net) |
| 03:33.33 | Repo | [WoW] 10achieveme: 03kremonted 07master * 1108d63 / (6 files in 1 directory): [new, +1 commit] Initial release |
| 04:05.16 | *** join/#curseforge ckknight (n=ckknight@WoWUIDev/WoWAce/CurseStaff/CurseForge/ckknight) |
| 04:05.16 | *** mode/#curseforge [+o ckknight] by ChanServ |
| 04:08.11 | Repo | [WoW] 10achieveme: 03kremonted 04v0.2 * cb2f96a /: [new tag, +1 commits] Tagging as v0.2 |
| 04:10.05 | Repo | [WoW] 10achieveme: 03kremonted 07master * v0.2-2-g5ee7891 /: [+2 commits] |
| 04:10.08 | Repo | 5ee7891: Merge branch 'master' of git@git.curseforge.net:wow/achieveme/mainline |
| 04:10.11 | Repo | 4e3e972: * Updated to more current codebase |
| 04:10.53 | *** join/#curseforge PProvost (n=PProvost@12.104.90.162) |
| 04:11.02 | Repo | [RoM] 10plantation: 03Alleris2_0 * r2 / (7 files in 2 directories): Initial Commit |
| 04:11.19 | Repo | [RoM] 10plantation: 03Alleris2_0 04v1.00 * r3 : Initial Release |
| 05:12.29 | Repo | [WoW] 10achieveme: 03kremonted 04v0.3 * 1c85a63 /: [new tag] Tagging as v0.3 |
| 05:34.11 | Repo | [WoW] New addon: http://wow.curseforge.com/addons/feastpower-10/. FeastPower. roasticle (Manager/Author). Approved by Ackis. |
| 05:34.15 | Repo | [WoW] New addon: http://wow.curseforge.com/addons/achieveme/. AchieveMe. kremonted (Manager/Author). Approved by Ackis. |
| 06:01.20 | *** join/#curseforge nevcairiel (n=hleppkes@WoWUIDev/WoWAce/Ace3/nevcairiel) |
| 06:01.20 | *** mode/#curseforge [+v nevcairiel] by ChanServ |
| 06:18.22 | *** join/#curseforge Elkano (n=elkano@WoWUIDev/WoWAce/Elkano) |
| 06:39.29 | *** join/#curseforge svenadh (n=sven@L0.moenchengladbach01.fdknet.de) |
| 07:20.30 | Repo | [RoM] 10heal-bot-2: 03sukram0815 * r108 / (7 files in 4 directories): v. 3.1.4108 - Beta |
| 07:20.34 | Repo | Bugfix: |
| 07:20.38 | Repo | - Changed Runerancer into Warden. |
| 07:37.17 | Repo | [RoM] 10heal-bot-2: 03sukram0815 * r109 / (3 files in 3 directories): v. 3.1.5109 |
| 07:37.21 | Repo | Bugfix: |
| 07:37.26 | Repo | - Forgotten to delete an echo command. ( spam in the chat :( ) |
| 07:38.53 | *** join/#curseforge Srosh (n=Srosh@c209090.adsl.hansenet.de) |
| 08:00.42 | *** join/#curseforge Gweniver (n=Gweniver@c-98-240-201-24.hsd1.mn.comcast.net) |
| 08:12.30 | *** join/#curseforge ZorbaGama (i=tocohl@maximilian.pavlovian.net) |
| 08:16.07 | *** join/#curseforge Dessa_ (n=Dessa@mail.gmake.de) |
| 08:19.34 | *** join/#curseforge Repo (n=supybot@repos.curseforge.net) |
| 08:21.52 | *** join/#curseforge Lawliepop (n=Lawliepo@70-239-165-239.lightspeed.snantx.sbcglobal.net) |
| 08:21.52 | *** join/#curseforge tlund (i=tlund@nxs.se) |
| 08:21.52 | *** join/#curseforge copystring (i=11794cop@o0o.o0o.o0o.o88-51-51-6o9.co.uk) |
| 08:26.28 | *** join/#curseforge Caleb| (n=caleb@dsl4E5C05EF.pool.t-online.hu) |
| 09:27.39 | *** join/#curseforge Computerpunk (i=IceChat7@95.76.179.17) |
| 09:30.26 | *** join/#curseforge ckknight (n=ckknight@WoWUIDev/WoWAce/CurseStaff/CurseForge/ckknight) |
| 09:30.26 | *** mode/#curseforge [+o ckknight] by irc.freenode.net |
| 09:31.26 | *** join/#curseforge Zealin (n=Lucas_Bi@cm56-200-51.liwest.at) |
| 09:51.32 | Repo | [WAR] 10warboard_togglerbusted: 03computerpunk * r2 / (6 files in 1 directory): - Initial Import. |
| 09:51.57 | Repo | [WAR] 10warboard_togglerbusted: 03computerpunk 040.1 * r3 : - Initial release. |
| 10:20.51 | Computerpunk | http://i29.tinypic.com/i4r0wn.jpg Keen eye for reporting. |
| 10:25.26 | Computerpunk | that means some unwanted ratings to the site. You could use another screenshot, in my opinion. |
| 10:54.13 | *** join/#curseforge Funkeh` (n=funk@WoWUIDev/WoWAce/Ace3/BigWigs/funkeh) |
| 10:54.13 | *** mode/#curseforge [+v Funkeh`] by ChanServ |
| 11:33.53 | *** join/#curseforge Zealin (n=Lucas_Bi@cm56-200-51.liwest.at) |
| 12:14.42 | *** join/#curseforge Hjalte (n=chatzill@cpe.ge-0-2-0-835.arcnqu2.customer.tele.dk) |
| 13:35.23 | *** join/#curseforge Computerpunk (i=IceChat7@95.76.179.17) |
| 13:57.59 | Repo | [WoW] 10gladius: 03kremonted 07master * v1.0.1-8-g107d63d /: [+2 commits] |
| 13:58.02 | Repo | 107d63d: * Fixed SendAnnouncement call for spec detection |
| 13:58.05 | Repo | 433f384: Merge branch 'master' of git@git.curseforge.net:wow/gladius/mainline |
| 14:11.31 | kremonte | ugh, i don't know why i seem to struggle using git so freaking much |
| 14:11.43 | Repo | [WoW] 10gladius: 03kremonted 07master * v1.0.1-9-ge6b9ece / (5 files in 2 directories): [+1 commit] * Fixed SendAnnouncement call in spec detection |
| 14:14.13 | charon | kremonte: why, what's wrong? |
| 14:14.53 | kremonte | charon: i dunno, i don't think i'm getting the normal workflow right |
| 14:15.34 | charon | heh. |
| 14:15.37 | kremonte | normally to begin, i do `git pull` to update my local codebase, then make my changes, `git commit -m "* fixed xyz", do that a few more times, then i'd think `git push` would work but it doesn't |
| 14:16.00 | kremonte | apparently i have to commit -> stage -> push, but i don't even know what staging is |
| 14:16.16 | kremonte | but i have to do `git commit -a` or something |
| 14:16.19 | charon | well, git has the "staging are" aka "index" aka "cache" aka a few more things |
| 14:16.35 | charon | 'git commit' commits what's *staged*, not what's in your working tree |
| 14:16.44 | charon | the upshot being that you can work on something for two hours and then make several commits out of it |
| 14:17.02 | kremonte | so how do you stage a file? |
| 14:17.07 | kremonte | or stage everything changed automatically |
| 14:17.11 | kremonte | ... git commit -a? lol |
| 14:17.18 | charon | you can use 'git add $file' to stage all changes in $file, or maybe you'll want to try 'git add -p' instead |
| 14:17.38 | kremonte | do i have to do that each time i update a file? |
| 14:17.52 | charon | yeah, 'git commit -a' stages all changed/deleted files, but it still won't pick up new files and it's also a bad habit to get into |
| 14:18.07 | kremonte | damnit bad habits that are easy to get into >:( |
| 14:18.09 | charon | you can also use 'git gui', it has some nice staging features |
| 14:19.04 | charon | and yes, you do have to stage the changes _somehow_.... whether that's 'git commit -a', 'git add $file', 'git add -p', 'git gui', or some of the other sledgehammers like 'git add -u' or 'git add .', is entirely up to you |
| 14:19.13 | charon | see the manpages for what the various options mean |
| 14:19.33 | charon | but i'll put it this way... i work a *lot* with (and on) git and i mostly use 'git add -p' |
| 14:19.50 | kremonte | i see, i was under the impression that i just run `git add .` during "setup" so to speak and then i only had to add new files; everything was added to the "watch list" per se during that first running |
| 14:20.03 | kremonte | does -p patch the files automatically? |
| 14:20.09 | charon | btw, i see someone (not you probably) forced a push to the gladius mainline. don't, unless you know what you're doing |
| 14:20.21 | charon | -p lets you select changes (diff hunks) to stage, and stages them independently of other changes to the file |
| 14:20.28 | charon | that way you can make two changes to a file, and only commit one of them |
| 14:21.40 | kremonte | what's wrong with pushing to the mainline if it's still marked as an alpha? how else would i keep my codebase synced with the other maintainers'? |
| 14:22.44 | charon | someone *forced* a push |
| 14:22.58 | charon | i.e., used 'git push -f' or 'git push origin +master' or some such |
| 14:23.10 | charon | doing so causes mass havoc for everyone else using the repository |
| 14:23.24 | charon | (well, not really, but you really have to communicate what you're doing and everyone has to be prepared for the consequences) |
| 14:24.06 | charon | that seems earlier than your oldest commit though, so i guess you're fine ;) |
| 14:24.20 | kremonte | phew, i got worried |
| 14:24.29 | kremonte | i've only used version control once, and that was with no other developers and on svn |
| 14:24.37 | kremonte | i'm desperately afraid i'm going to break something |
| 14:24.53 | charon | yeah, i just mentioned that so you won't get tempted to use -f without first asking/reading up |
| 14:25.01 | kremonte | so, what would be your recommended workflow from start to finish? |
| 14:25.20 | charon | does your git have "man gitworkflows"? |
| 14:25.43 | charon | that's what i like to use, though it might be a bit overblown for a project with little traffic |
| 14:25.54 | kremonte | no, running on windows but The Google always saves the day :) |
| 14:26.08 | kremonte | i wish windows had man pages |
| 14:26.10 | charon | in short, use a topic branch for everything (say a bugfix, feature, ...) and then use merges to propagate these |
| 14:26.16 | kremonte | heh i wish windows was a lot of different things :[ |
| 14:26.32 | charon | if your co-authors have the time, you can first push the topics to the repo (just not to master!) and have them reviewed |
| 14:26.54 | kremonte | how do i push to something other than master? |
| 14:27.10 | charon | 'git push origin $somebranch' will push $somebranch and create it on the remote |
| 14:27.10 | Computerpunk | tl;dr |
| 14:27.20 | charon | Computerpunk: ? |
| 14:27.55 | charon | (i know what it means, but i'd like to know what you were referring to) |
| 14:28.07 | kremonte | charon: so if i want to say, start work for a day with the intent of creating Feature Y |
| 14:28.24 | kremonte | do i start with git pull? then git branch, work, git add, git push origin branch? |
| 14:29.41 | charon | kremonte: i usually do it like so: git fetch; git checkout -b tr/somefeature origin/master; hack hack hack; git add -p; git commit; repeat until satisfied; git rebase -i origin/master; git push origin tr/somefeature |
| 14:29.52 | charon | "tr" are my initials so you might want to change that ;) |
| 14:30.13 | charon | look in 'man git-rebase' what rebase -i does, it lets you clean up your topic in case you need to fix older commits. |
| 14:30.42 | kremonte | hmm |
| 14:30.58 | charon | granted, you may still want to say 'git pull' while on master, so that you can actually work with master |
| 14:31.04 | kremonte | after i push that feature, by what process does it get added to the mainline? |
| 14:31.13 | charon | merging it to master |
| 14:31.29 | kremonte | so git merge is server side? |
| 14:31.39 | kremonte | or would i merge it then push that |
| 14:32.24 | charon | merge is always local because it needs a worktree |
| 14:32.39 | charon | so you'd go: git checkout master; git pull; git merge somebranch; git merge someotherbranch; git push |
| 14:33.17 | charon | the whole topic dance is very helpful because it means you can, say, get out of invent-a-feature mode to do a bugfix on some other topic, merge and push, and go back to the feature branch |
| 14:33.42 | charon | (you'd do a temporary commit of all pending work on the feature branch before switching, and use 'git reset HEAD^' to discard it again after going back) |
| 14:33.55 | Computerpunk | charon: this wall of text. |
| 14:34.10 | Computerpunk | charon: It's not my business, it's too long, I won't read it. :D |
| 14:34.33 | Repo | [WoW] 10goingprice_wowhead: 03Neikos * r379 / (2 files in 2 directories): Updating to version 3.1.1249050724 |
| 14:34.52 | charon | Computerpunk: phew. for a second there i thought you were complaining about man gitworkflows. but as long as you're just complaining about *me* it's ok |
| 14:35.14 | Repo | [WoW] 10goingprice_wowhead: 03Neikos 043.1.1249050724 * r380 : Tagging version 3.1.1249050724 |
| 14:36.27 | charon | kremonte: in any case, if you run into more problems feel free to ask me (though i'm not always at the terminal) or head over to #git, the folks there are always nice and helpful |
| 14:47.18 | Repo | [WoW] New addon: http://wow.curseforge.com/addons/heroes/. Heroes. AereaIT (Manager/Author). Approved by Ackis. |
| 14:47.23 | Repo | [WoW] New addon: http://wow.curseforge.com/addons/hbfu/. HBFu. skilee6 (Manager/Author). Approved by Ackis. |
| 14:47.28 | Repo | [WoW] New addon: http://wow.curseforge.com/addons/utotaunt/. UtoTaunt. ornomus (Manager/Author). Approved by Ackis. |
| 14:47.33 | Repo | [WoW] New addon: http://wow.curseforge.com/addons/portalbot/. PortalBot. roasticle (Manager/Author). Approved by Ackis. |
| 14:49.32 | *** join/#curseforge Gweniver (n=Gweniver@c-98-240-201-24.hsd1.mn.comcast.net) |
| 14:50.18 | *** join/#curseforge ckknight (n=ckknight@WoWUIDev/WoWAce/CurseStaff/CurseForge/ckknight) |
| 14:50.18 | *** mode/#curseforge [+o ckknight] by ChanServ |
| 14:50.28 | *** join/#curseforge Odlaw (i=Unknown@c-98-245-39-78.hsd1.co.comcast.net) |
| 15:03.56 | Bruners | hi ckknight |
| 15:05.39 | Repo | [WoW] 10logintimerfu: 03lff0305 * r28 FuBar_LoginTimerFu.toc: Update interface to 30100 in .toc |
| 15:11.27 | Repo | [WoW] 10goingprice_allakhazam: 03Neikos * r807 / (2 files in 2 directories): Updating to version 3.1.1249052947 |
| 15:11.32 | Repo | [WoW] 10goingprice_allakhazam: 03Neikos 043.1.1249052947 * r808 : Tagging version 3.1.1249052947 |
| 15:32.31 | *** join/#curseforge sztanpet (n=sztanpet@142.58ec54.tvnetwork.hu) |
| 15:39.00 | ckknight | hey Bruners |
| 16:15.13 | *** join/#curseforge Proditor (i=proditor@c80-217-110-209.bredband.comhem.se) |
| 16:20.46 | *** join/#curseforge nevcairiel (n=hleppkes@WoWUIDev/WoWAce/Ace3/nevcairiel) |
| 16:20.46 | *** mode/#curseforge [+v nevcairiel] by ChanServ |
| 16:38.29 | *** join/#curseforge Srosh_ (n=Srosh@c132201.adsl.hansenet.de) |
| 16:43.00 | Repo | [www] 10gypsy: 03ckknight * r148 gypsy (5 files in 2 directories): allow specification of Response mixins. Add GypsyResponseException, which can be raised and expected to be a response. This allows for views to raise their response rather than returning. |
| 16:43.01 | Repo | tweak |
| 17:11.02 | *** join/#curseforge Xtek (n=nnscript@69.73.16.202) |
| 17:13.30 | Computerpunk | charon: Jesus Christ, I wasn't complaining about you. |
| 17:13.37 | Computerpunk | I just don't like walls of text which are not my business. |
| 17:13.41 | Computerpunk | Why would I complain on a public channel? |
| 17:13.44 | Computerpunk | It ain't a private message. |
| 17:13.55 | Computerpunk | Don't think I got something against you, and hope you don't have something against me! |
| 17:14.08 | charon | Computerpunk: i was absolutely dead serious. and i also seriously think you need a new iron-o-meter ;) |
| 17:14.31 | Computerpunk | What would that iron-o-meter be for? Sorry, but I don't get it.:D |
| 17:14.41 | charon | detect irony over the internet |
| 17:14.59 | Computerpunk | Mkay. |
| 17:15.16 | Computerpunk | <.< |
| 17:15.27 | charon | well, ok, i admit that wasn't so clear above |
| 17:15.47 | charon | in any case i only asked the original question because i wrote man gitworkflows, and thought there was room for improvement if you thought it was too long :) |
| 17:16.32 | charon | (but you didn't, so there isn't, which is fine) |
| 17:36.10 | *** join/#curseforge Zealin (n=Lucas_Bi@cm56-200-51.liwest.at) |
| 17:46.41 | *** join/#curseforge Tinyboom (n=nahh@182.80-202-154.nextgentel.com) |
| 17:54.08 | *** join/#curseforge texke (n=tex@pdpc/supporter/base/texke) |
| 18:09.13 | Repo | [RoM] 10sparty (experimental): 03Samtrion * r8 lua (3 files in 1 directory): Initial commit |
| 18:09.18 | Repo | AutoLoot rebuild |
| 19:37.13 | Repo | [RoM] 10sparty (experimental): 03Samtrion * r9 lua (3 files in 1 directory): Added AddOnManager support |
| 20:09.22 | *** join/#curseforge Zeksie (n=zeksie@cpc1-nott9-0-0-cust756.nott.cable.ntl.com) |
| 20:21.36 | *** join/#curseforge Dashkal (n=dashkal@WoWUIDev/Nexus/dashkal) |
| 20:21.36 | *** mode/#curseforge [+v Dashkal] by ChanServ |
| 21:10.22 | *** join/#curseforge Repo_ (n=supybot@repos.curseforge.net) |
| 21:11.23 | *** join/#curseforge Repo (n=supybot@repos.curseforge.net) |
| 21:14.18 | *** join/#curseforge Repo (n=supybot@repos.curseforge.net) |
| 21:14.50 | Repo | [RoM] 10sknight: 03Samtrion * r17 sKnight.lua: added AddonManager support |
| 22:00.23 | *** part/#curseforge Kody- (n=nope@adsl-99-173-10-198.dsl.pltn13.sbcglobal.net) |
| 22:04.38 | *** join/#curseforge Tinyboom (n=nahh@182.80-202-154.nextgentel.com) |
| 23:13.25 | *** join/#curseforge Arrowmaster (n=arrow@WoWUIDev/WoWAce/ResponsibleForEverythingAndNothing/Arrowmaster) |
| 23:13.25 | *** mode/#curseforge [+v Arrowmaster] by ChanServ |
| 23:32.51 | *** join/#curseforge Funkeh` (n=funk@WoWUIDev/WoWAce/Ace3/BigWigs/funkeh) |
| 23:32.51 | *** mode/#curseforge [+v Funkeh`] by ChanServ |
| 23:32.57 | *** join/#curseforge Speeddymon (i=chatzill@doc-209-33-85-62.kingwood.tx.cebridge.net) |
| 23:35.02 | Repo | [RoM] 10rom-addon-wizard: 03Alleris2_0 * r4 / (26 files in 11 directories): Started using self |
| 23:35.05 | Repo | Fixed a bunch of errors and typos |
| 23:35.10 | Repo | Removed defaulting to StopWatch |
| 23:59.52 | *** join/#curseforge ckknight_ (n=ckknight@c-68-62-175-169.hsd1.al.comcast.net) |
