| 00:00.39 | *** join/#arl Repo_ (n=supybot@repos.curseforge.net) |
| 00:01.44 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 00:01.44 | *** mode/#arl [+v Repo] by ChanServ |
| 00:02.52 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 00:02.52 | *** mode/#arl [+v Repo] by ChanServ |
| 00:53.45 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 00:53.45 | *** mode/#arl [+v Repo] by ChanServ |
| 00:59.00 | *** join/#arl pompy (n=Mike@c-68-38-45-3.hsd1.nj.comcast.net) |
| 00:59.00 | *** mode/#arl [+o pompy] by ChanServ |
| 01:00.26 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 01:00.26 | *** mode/#arl [+v Repo] by ChanServ |
| 02:15.45 | *** join/#arl Torhal_ (n=callahan@74-132-200-5.dhcp.insightbb.com) |
| 02:15.45 | *** mode/#arl [+o Torhal_] by ChanServ |
| 03:19.46 | *** part/#arl pompy (n=Mike@c-68-38-45-3.hsd1.nj.comcast.net) |
| 03:27.27 | *** join/#arl pompy (n=Mike@c-68-38-45-3.hsd1.nj.comcast.net) |
| 03:27.27 | *** mode/#arl [+o pompy] by ChanServ |
| 06:39.59 | *** join/#arl Torhal (n=callahan@74-132-200-5.dhcp.insightbb.com) |
| 06:39.59 | *** mode/#arl [+o Torhal] by ChanServ |
| 06:59.35 | *** join/#arl pompy (n=Mike@c-68-38-45-3.hsd1.nj.comcast.net) |
| 06:59.35 | *** mode/#arl [+o pompy] by ChanServ |
| 07:32.13 | *** join/#arl robotusch (n=robotusc@50A2DBFE.flatrate.dk) |
| 08:02.16 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 08:02.16 | *** mode/#arl [+v Repo] by ChanServ |
| 09:12.01 | *** join/#arl pompy1 (n=Mike@c-68-38-45-3.hsd1.nj.comcast.net) |
| 09:15.24 | *** join/#arl pompy1 (n=Mike@c-68-38-45-3.hsd1.nj.comcast.net) |
| 09:18.36 | *** join/#arl pompy2 (n=Mike@c-68-38-45-3.hsd1.nj.comcast.net) |
| 09:48.08 | *** join/#arl robotusch (n=robotusc@50A2DBFE.flatrate.dk) |
| 10:49.23 | *** join/#arl pompy (n=Mike@c-68-38-45-3.hsd1.nj.comcast.net) |
| 10:49.23 | *** mode/#arl [+o pompy] by ChanServ |
| 15:58.40 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 15:58.40 | *** mode/#arl [+v Repo] by ChanServ |
| 15:59.42 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 15:59.42 | *** mode/#arl [+v Repo] by ChanServ |
| 16:01.14 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 16:01.14 | *** mode/#arl [+v Repo] by ChanServ |
| 16:02.35 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 16:02.35 | *** mode/#arl [+v Repo] by ChanServ |
| 16:03.58 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 16:03.58 | *** mode/#arl [+v Repo] by ChanServ |
| 16:05.09 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 16:05.09 | *** mode/#arl [+v Repo] by ChanServ |
| 16:06.29 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 16:06.29 | *** mode/#arl [+v Repo] by ChanServ |
| 16:07.46 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 16:07.46 | *** mode/#arl [+v Repo] by ChanServ |
| 17:09.54 | *** join/#arl Repo (n=supybot@69.57.184.216) |
| 17:09.56 | *** mode/#arl [+v Repo] by ChanServ |
| 17:15.43 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 17:15.43 | *** mode/#arl [+v Repo] by ChanServ |
| 17:20.47 | *** join/#arl pompy (n=Mike@c-68-38-45-3.hsd1.nj.comcast.net) |
| 17:20.47 | *** mode/#arl [+o pompy] by ChanServ |
| 17:26.44 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 17:26.44 | *** mode/#arl [+v Repo] by ChanServ |
| 17:35.02 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 17:35.02 | *** mode/#arl [+v Repo] by ChanServ |
| 18:56.17 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 18:56.17 | *** mode/#arl [+v Repo] by ChanServ |
| 19:05.32 | Ackis | hai Torhal |
| 19:05.37 | Ackis | I fixed an issue in collectinator |
| 19:05.52 | Torhal | Oh? |
| 19:06.17 | Ackis | that mob printing out stuff was broken |
| 19:06.33 | Torhal | Yes, I told you :) |
| 19:06.44 | Torhal | Or, rather, I told the commt message |
| 19:07.45 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 19:07.45 | *** mode/#arl [+v Repo] by ChanServ |
| 19:07.45 | Torhal | <PROTECTED> |
| 19:07.46 | Ackis | ah I didn't see that, repo's been wonky |
| 19:07.48 | Ackis | it's fixed now however and I added in vendor/quest |
| 19:07.48 | Ackis | at least I think it's fixed |
| 19:10.23 | Torhal | screams |
| 19:10.23 | Torhal | error: Entry 'Collectinator.lua' would be overwritten by merge. Cannot merge. |
| 19:11.32 | Ackis | wot? |
| 19:11.46 | Torhal | I tried: git pull origin master |
| 19:11.50 | Torhal | And saw that |
| 19:12.01 | Ackis | ... |
| 19:12.10 | Ackis | you comitted everything last night right? |
| 19:12.30 | Torhal | Yes, but didn't push. I can't evemn do that. |
| 19:12.40 | Ackis | ugh |
| 19:13.09 | Torhal | To git@git.wowace.com:wow/collectinator/mainline.git |
| 19:13.10 | Torhal | <PROTECTED> |
| 19:13.12 | Torhal | error: failed to push some refs to 'git@git.wowace.com:wow/collectinator/mainline.git' |
| 19:13.48 | Ackis | yah because I modifiied collectinator.lua today, I thought everything was pushed |
| 19:14.39 | Torhal | Modified how? |
| 19:15.15 | Ackis | updated AddCompanionAcquire |
| 19:15.15 | Torhal | I mean, this shit is supposed to work with multiple users unless one does some really heavy shit |
| 19:15.20 | Ackis | I know |
| 19:15.27 | Torhal | You're still inserting Windows shuit aren't you? |
| 19:15.30 | Ackis | I just added a few lines (8 in) |
| 19:15.31 | Torhal | :P |
| 19:15.34 | Ackis | no I fixed that |
| 19:15.58 | Torhal | 8 lines isn't heavy enough to break my push/pull |
| 19:16.15 | Kaelten | Torhal: plus side is that the packager is behaving much better today |
| 19:16.45 | Torhal | Tell the git repository to do the same, please. :) |
| 19:17.02 | Ackis | I really don't know what's going on |
| 19:17.22 | Torhal | I don't know how to fix this. I Renamed the file and tried to do a pull and it won't let me. I get the same "will be overwritten" message. |
| 19:17.24 | Torhal | Fuck. |
| 19:17.25 | Kaelten | sounds like do a fresh checkout and a diff |
| 19:17.44 | Kaelten | real solution though is to use mercurial |
| 19:17.45 | Kaelten | :D |
| 19:17.46 | Torhal | i'M NOT AWAKE ENOUGH TO REMEMBER HOW. :) |
| 19:17.50 | Torhal | Damn caps |
| 19:18.06 | Kaelten | lol |
| 19:18.08 | Kaelten | wake up! |
| 19:18.10 | Kaelten | ehem |
| 19:18.34 | Ackis | I couldn't get hg to work so pfft |
| 19:28.45 | Ackis | Torhal: can I do a commit to collectinator (one of the dbs) or will that screw you up even more/ |
| 19:29.01 | Torhal | I can't push or pull so I'm pretty fucked already. |
| 19:29.25 | Torhal | I need to rename my directory, then clone the repo again, then hand-diff my changes. |
| 19:29.34 | Ackis | bleh |
| 19:30.12 | Torhal | I don't even remember what I did push last night, but after it didn't show up in-channel or on the project page, I didn't push anything else |
| 19:30.47 | Ackis | yah I got changes from you (I think) which is why I went ahead and did editting, the hand-diff won't be difficult because I really didn't add much in |
| 19:32.28 | Torhal | I think I did stuff after what's showing in the project page |
| 19:32.40 | Torhal | But I won't know until the diff. |
| 20:00.37 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 20:00.37 | *** mode/#arl [+v Repo] by ChanServ |
| 20:28.46 | *** join/#arl Repo (n=supybot@repos.curseforge.net) |
| 20:28.46 | *** mode/#arl [+v Repo] by ChanServ |
| 20:35.13 | *** join/#arl Kaelten (n=Kaelten@WoWUIDev/WoWAce/WoWIFA/CurseStaff/kaelten) |
| 21:44.31 | *** join/#arl BWMerlin (n=chatzill@58.174.148.250) |
| 21:44.31 | *** mode/#arl [+v BWMerlin] by ChanServ |