--- Log opened Tue Mar 12 00:00:27 2013
20130312 00:27:01-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has quit [Remote host closed the connection]
20130312 00:41:19-!- Blueblaze [~Blueblaze@adsl-99-158-46-191.dsl.hstntx.sbcglobal.net] has quit [Quit: Blueblaze]
20130312 00:50:17-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Quit: bumbadadabum]
20130312 00:55:43-!- Blueblaze [~Blueblaze@adsl-99-158-46-191.dsl.hstntx.sbcglobal.net] has joined #wesnoth-umc-dev
20130312 01:08:28-!- skyfaller [~skyfaller@24.185.7.74] has joined #wesnoth-umc-dev
20130312 01:08:28-!- skyfaller [~skyfaller@24.185.7.74] has quit [Changing host]
20130312 01:08:28-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has joined #wesnoth-umc-dev
20130312 01:47:46-!- faabumc [~vcr@wesnoth/developer/faabumc] has joined #wesnoth-umc-dev
20130312 01:48:26-!- mattsc [~mattsc@d154-20-34-165.bchsia.telus.net] has joined #wesnoth-umc-dev
20130312 02:07:16-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-umc-dev
20130312 02:26:41-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20130312 02:32:57-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has quit [Remote host closed the connection]
20130312 02:58:21-!- pydsigner [~Thunderbi@unaffiliated/pydsigner] has joined #wesnoth-umc-dev
20130312 03:03:37-!- SpoOkyMagician [~chatzilla@74-141-249-126.dhcp.insightbb.com] has joined #wesnoth-umc-dev
20130312 03:08:32-!- SpoOkyMagician [~chatzilla@74-141-249-126.dhcp.insightbb.com] has quit [Quit: meh]
20130312 03:11:31< pydsigner> ...
20130312 03:26:30< pydsigner> shadowm: How do I go about merging my work with SpoOkyMagician's UGS?
20130312 03:37:25-!- pydsigner is now known as pydsigner|away
20130312 03:39:51-!- un214 [~un214@2602:306:cf11:d5d9:224:8cff:fed2:ef57] has joined #wesnoth-umc-dev
20130312 03:40:04< un214> four_seasons_of_year and moja_era are broken
20130312 03:40:37< AI0867> great. Do you know who the maintainers are?
20130312 03:41:09< un214> nope
20130312 03:41:28< un214> all I know is I get WML errors referencing them and MP won't load
20130312 03:43:28< un214> oh DUH - Four Seasons of Year assumes cases insensitive filesystem
20130312 03:44:26< AI0867> well, this actually *isn't* the place every UMC author ever hangs out
20130312 03:44:47< AI0867> so unless you know who the maintainer is, and that they're here, your best bet remains the forums
20130312 03:44:56< un214> that's where it's going
20130312 03:45:29< un214> I just don't like addons that break MP being left up
20130312 03:48:05< un214> http://forums.wesnoth.org/viewtopic.php?f=15&t=38485
20130312 03:50:05< shadowm> pydsigner|away: I don't know? I don't know what UGS is either.
20130312 03:50:19< shadowm> Why don't you PM him in the forums?
20130312 03:52:01< un214> is the main server down?
20130312 03:52:16< shadowm> No idea.
20130312 03:52:26< un214> because connecting times out for me
20130312 03:52:31< shadowm> I am talking from wesnoth.org, anyway.
20130312 03:53:01< shadowm> I just joined the 1.10 lobby.
20130312 03:53:02< un214> I can load the website. The MP server takes longer than I'm willing to wait to get a login.
20130312 03:53:13< un214> what's its host and port?
20130312 03:53:25< shadowm> server.wesnoth.org:15000
20130312 03:53:46-!- AI0867 [~ai@wesnoth/developer/ai0867] has quit [Ping timeout: 245 seconds]
20130312 03:53:58< shadowm> The effective port is 14999, but you first talk to the instance on 15000.
20130312 03:54:30< shadowm> server.wesnoth.org has the same IP as wesnoth.org.
20130312 03:54:43< un214> came back up in the interval
20130312 03:55:05< un214> must have been a specific port block because the website worked even while I was sensing server down
20130312 03:55:10-!- Blueblaze [~Blueblaze@adsl-99-158-46-191.dsl.hstntx.sbcglobal.net] has quit [Ping timeout: 252 seconds]
20130312 03:55:36-!- AI0867 [~ai@wesnoth/developer/ai0867] has joined #wesnoth-umc-dev
20130312 03:57:16< pydsigner|away> shadowm: UGS, Unwelcome Guest Series
20130312 03:57:33< pydsigner|away> On the UMC SVN
20130312 03:57:37< shadowm> That doesn't really tell me anything, but okay.
20130312 03:57:42-!- pydsigner|away is now known as pydsigner
20130312 03:57:57< pydsigner> Sourceforge?
20130312 03:58:19< shadowm> Wesnoth-UMC-Dev is hosted on SourceForge.net, yes.
20130312 03:58:25< pydsigner> Yeah
20130312 03:58:35< pydsigner> Do you know how to do a commit merge?
20130312 03:58:39< shadowm> I know this because I founded it.
20130312 03:58:44< shadowm> pydsigner: Define "commit merge".
20130312 03:58:46< un214> diff | patch ??
20130312 03:59:27< pydsigner> svn: E155015: Commit failed (details follow):
20130312 03:59:28< pydsigner> svn: E155015: Aborting commit: '/home/pydsigner/.local/share/wesnoth/1.10/data/add-ons/Unwelcome_Guests_Series/maps' remains in conflict
20130312 03:59:54< shadowm> svn up
20130312 04:00:37< pydsigner> And then?
20130312 04:01:01< shadowm> That's it.
20130312 04:01:13< shadowm> Oh, you mean you have local conflicts?
20130312 04:01:33< shadowm> Check them in a text editor (conflict markers look like >>>> <<<<) and fix as necesary.
20130312 04:01:36< shadowm> *necessary.
20130312 04:01:52< un214> back up your local file first
20130312 04:03:59< shadowm> I can't really give you any better advice than that because I haven't used Subversion directly in years.
20130312 04:05:18< pydsigner> I'm not finding any such markers...
20130312 04:10:54-!- faabumc [~vcr@wesnoth/developer/faabumc] has quit [Quit: Ex-Chat]
20130312 04:13:38-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-umc-dev
20130312 04:14:18-!- Blueblaze [~Blueblaze@adsl-99-158-46-191.dsl.hstntx.sbcglobal.net] has joined #wesnoth-umc-dev
20130312 04:21:48-!- pydsigner [~Thunderbi@unaffiliated/pydsigner] has quit [Ping timeout: 245 seconds]
20130312 04:46:37-!- un214 [~un214@2602:306:cf11:d5d9:224:8cff:fed2:ef57] has quit [Remote host closed the connection]
20130312 05:39:25-!- mattsc [~mattsc@d154-20-34-165.bchsia.telus.net] has quit [Quit: bye]
20130312 06:44:47-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-umc-dev
20130312 08:28:20-!- AI0867 [~ai@wesnoth/developer/ai0867] has quit [Ping timeout: 272 seconds]
20130312 08:29:35-!- AI0867 [~ai@wesnoth/developer/ai0867] has joined #wesnoth-umc-dev
20130312 09:23:24-!- Crendgrim [~crend@port-92-204-47-133.dynamic.qsc.de] has joined #wesnoth-umc-dev
20130312 10:05:58-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit []
20130312 10:15:58-!- Crendgrim [~crend@port-92-204-47-133.dynamic.qsc.de] has quit [Quit: Konversation terminated!]
20130312 10:23:23-!- Blueblaze [~Blueblaze@adsl-99-158-46-191.dsl.hstntx.sbcglobal.net] has quit [Quit: Blueblaze]
20130312 10:24:57-!- Crendgrim [~crend@port-92-204-47-133.dynamic.qsc.de] has joined #wesnoth-umc-dev
20130312 10:34:33< vultraz> !log HEAD
20130312 10:36:17< vultraz> does wesbot have le commit logs?
20130312 10:39:22< vultraz> oh, I think that was shikadibot
20130312 12:06:23-!- loonybot [~loonybot@158.255.133.34] has joined #wesnoth-umc-dev
20130312 12:06:23-!- loonybot [~loonybot@158.255.133.34] has quit [Changing host]
20130312 12:06:23-!- loonybot [~loonybot@wesnoth/bot/loonybot] has joined #wesnoth-umc-dev
20130312 12:06:26-!- mode/#wesnoth-umc-dev [+v loonybot] by ChanServ
20130312 13:03:34-!- Crendgrim [~crend@port-92-204-47-133.dynamic.qsc.de] has quit [Quit: Konversation terminated!]
20130312 13:44:47-!- trewe [~trewe@87.196.145.61] has joined #wesnoth-umc-dev
20130312 13:57:00-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has joined #wesnoth-umc-dev
20130312 13:59:34-!- AI0867 [~ai@wesnoth/developer/ai0867] has quit [Ping timeout: 245 seconds]
20130312 14:01:27-!- AI0867 [~ai@wesnoth/developer/ai0867] has joined #wesnoth-umc-dev
20130312 14:06:02-!- mattsc [~mattsc@216.13.187.190] has joined #wesnoth-umc-dev
20130312 14:34:44-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has quit [Remote host closed the connection]
20130312 15:02:50-!- mattsc [~mattsc@216.13.187.190] has quit [Quit: I'm asleep]
20130312 15:21:27-!- mattsc [~mattsc@fw.hia.nrc.ca] has joined #wesnoth-umc-dev
20130312 16:45:04-!- skyfaller [~skyfaller@ool-43551edd.dyn.optonline.net] has joined #wesnoth-umc-dev
20130312 16:45:04-!- skyfaller [~skyfaller@ool-43551edd.dyn.optonline.net] has quit [Changing host]
20130312 16:45:04-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has joined #wesnoth-umc-dev
20130312 16:49:26-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Read error: Connection reset by peer]
20130312 16:50:49-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-umc-dev
20130312 17:12:22-!- trewe [~trewe@87.196.145.61] has quit [Read error: Operation timed out]
20130312 18:09:02-!- AI0867 [~ai@wesnoth/developer/ai0867] has quit [Ping timeout: 255 seconds]
20130312 18:11:03-!- AI0867 [~ai@wesnoth/developer/ai0867] has joined #wesnoth-umc-dev
20130312 18:22:29-!- trewe [~trewe@87.196.145.61] has joined #wesnoth-umc-dev
20130312 18:38:02-!- AI0867 [~ai@wesnoth/developer/ai0867] has quit [Ping timeout: 240 seconds]
20130312 18:50:06-!- AI0867 [~ai@wesnoth/developer/ai0867] has joined #wesnoth-umc-dev
20130312 19:03:47-!- trewe [~trewe@87.196.145.61] has quit [Quit: Quit]
20130312 19:15:32-!- iwaim [~iwaim@2001:2c0:40e:2002:0:4:14:80] has quit [Ping timeout: 256 seconds]
20130312 19:25:28-!- fendrin [~fabi@wesnoth/developer/fendrin] has quit [Quit: Konversation terminated!]
20130312 19:34:49-!- mattsc [~mattsc@fw.hia.nrc.ca] has quit [Quit: I'm asleep]
20130312 19:46:31-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-umc-dev
20130312 20:25:10-!- Blueblaze [~Blueblaze@adsl-99-158-46-191.dsl.hstntx.sbcglobal.net] has joined #wesnoth-umc-dev
20130312 20:25:48-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20130312 20:40:15-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-umc-dev
20130312 21:17:36-!- AI0867 [~ai@wesnoth/developer/ai0867] has quit [Ping timeout: 264 seconds]
20130312 21:25:57-!- pydsigner [~Thunderbi@unaffiliated/pydsigner] has joined #wesnoth-umc-dev
20130312 21:31:42-!- AI0867 [~ai@wesnoth/developer/ai0867] has joined #wesnoth-umc-dev
20130312 22:39:12-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-umc-dev
20130312 23:01:40-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Read error: Connection reset by peer]
20130312 23:03:51-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-umc-dev
20130312 23:26:04-!- mattsc [~mattsc@d154-20-34-165.bchsia.telus.net] has joined #wesnoth-umc-dev
20130312 23:33:04-!- fendrin [~fabi@88-134-19-146-dynip.superkabel.de] has joined #wesnoth-umc-dev
20130312 23:33:04-!- fendrin [~fabi@88-134-19-146-dynip.superkabel.de] has quit [Changing host]
20130312 23:33:04-!- fendrin [~fabi@wesnoth/developer/fendrin] has joined #wesnoth-umc-dev
20130312 23:34:12-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20130312 23:38:27-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Read error: Connection reset by peer]
20130312 23:38:44-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-umc-dev
20130312 23:47:04-!- trewe [~trewe@87.196.145.61] has joined #wesnoth-umc-dev
20130312 23:54:32-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-umc-dev
--- Log closed Wed Mar 13 00:00:29 2013