--- Log opened Tue Oct 28 00:00:11 2014
20141028 00:05:58-!- irker723 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout]
20141028 00:07:21-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20141028 00:11:55-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev
20141028 00:28:25-!- ancestral [~ancestral@63.92.240.233] has quit [Quit: i go nstuf kthxbai]
20141028 00:44:52-!- gfgtdf [~chatzilla@f054057123.adsl.alicedsl.de] has quit [Quit: ChatZilla 0.9.91 [Firefox 32.0.3/20140923175406]]
20141028 00:50:25-!- Kexoth [~kex@77.28.31.166] has quit [Remote host closed the connection]
20141028 00:50:45-!- kex [~kex@77.28.31.166] has joined #wesnoth-dev
20141028 00:50:50-!- kex [~kex@77.28.31.166] has quit [Remote host closed the connection]
20141028 00:56:02-!- sachith500 [~kvirc@112.134.174.43] has joined #wesnoth-dev
20141028 01:03:20-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20141028 01:05:45-!- mjs-de [~mjs-de@f049142004.adsl.alicedsl.de] has joined #wesnoth-dev
20141028 01:21:43-!- ancestral [~ancestral@mobile-198-228-233-071.mycingular.net] has joined #wesnoth-dev
20141028 01:21:56< ancestral> iceiceice: Found where it installed
20141028 01:22:09< ancestral>  /private/tmp
20141028 01:22:21< iceiceice> ancestral: i was going to tell you,
20141028 01:22:26< iceiceice> from my experiments with linuxbrew,
20141028 01:22:38< iceiceice> it seems that, when installation crashes (in debug mode) and i go to debugger,
20141028 01:22:48< iceiceice> i can find the working directory in ~/tmp
20141028 01:23:02< iceiceice> or i can configure this by setting HOMEBREW_TEMP environment variable
20141028 01:23:08< iceiceice> but it all gets deleted when you exit debug mode
20141028 01:23:14< ancestral> The log for echo told me, but it seems that it deleted the executable
20141028 01:23:15< iceiceice> so i think the system sort of requires you to install somewhere
20141028 01:23:25< ancestral> Yeah
20141028 01:26:25-!- kex [~kex@78.157.29.160] has joined #wesnoth-dev
20141028 01:27:55< ancestral> Is there a parameter I can specify with `brew install` or an environment variable?
20141028 01:28:38< ancestral> (FWIW I did `brew install wesnoth --HEAD`)
20141028 01:28:53< ancestral> (no debug)
20141028 01:28:55< iceiceice> ancestral: i tried to figure this out earlier,
20141028 01:29:05< iceiceice> i think scons has some arguments "bindir" and "datadir"
20141028 01:29:29< ancestral> Oh, well that would be great
20141028 01:31:08< ancestral> Sorry to bother you on this, can I define this in wesnoth.rb?
20141028 01:31:35< iceiceice> yeah that woudl be the idea
20141028 01:31:40< iceiceice> i just tried it on my machine thoguh and it didn't work
20141028 01:33:02< ancestral> cmake did put wesnoth in the right place for me, btw
20141028 01:33:46-!- vultraz [~chatzilla@124.109.10.167] has joined #wesnoth-dev
20141028 01:33:53-!- vultraz [~chatzilla@124.109.10.167] has quit [Changing host]
20141028 01:33:53-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev
20141028 01:33:58-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20141028 01:34:35< iceiceice> ok i think this did kind of work: `scons bindir=~/w-bin datadir=~/w-data install`
20141028 01:34:52< iceiceice> it was just a test...
20141028 01:35:32< iceiceice> i got this out of it:
20141028 01:35:33< iceiceice> https://gist.github.com/cbeck88/0f27d32355a3bada68f1
20141028 01:35:50< iceiceice> so it halted at "docs" because it doesnt have permission,
20141028 01:36:03< iceiceice> but i think you probably only need data, images, sounds, and fonts to play
20141028 01:36:09< iceiceice> i guess you wont have translations 
20141028 01:36:29< ancestral> Others could?
20141028 01:36:31< iceiceice> oh hey
20141028 01:36:46< iceiceice> line 700 of sconstruct shows howt o make Mas OS application bundles
20141028 01:36:56< ancestral> Oh snap!
20141028 01:37:18< iceiceice> i guess you could try "wesnoth-bundle" as a target, instead of "install" ?
20141028 01:37:55< iceiceice> there seems to be some variable "$TARGET" involved here also, not sure...
20141028 01:38:25< ancestral> I’ll have to try it once I get home ~25 min train ride
20141028 01:43:06 * ancestral really wants nightly Mac builds 😀
20141028 01:43:31 * shadowm too.
20141028 01:47:03< mattsc> ancestral: will that mean that I eventually won’t have to produce OS X release packages any more?
20141028 01:47:29< ancestral> Possibly
20141028 01:47:56< ancestral> Instead someone will have to monitor the script and make sure it doesn’t break
20141028 01:48:03< mattsc> cool
20141028 01:48:11< ancestral> It could be…
20141028 01:48:55< mattsc> Will the builds work for OS X 10.5?
20141028 01:50:14-!- ancestral [~ancestral@mobile-198-228-233-071.mycingular.net] has quit [Read error: Connection reset by peer]
20141028 01:50:35-!- ancestral [~ancestral@mobile-198-228-233-071.mycingular.net] has joined #wesnoth-dev
20141028 02:01:06-!- ancestral [~ancestral@mobile-198-228-233-071.mycingular.net] has quit [Quit: Smell ya later!]
20141028 02:04:12< shadowm> I hate the RNG somtimes.
20141028 02:04:16-!- ancestral [~ancestral@mobile-198-228-233-071.mycingular.net] has joined #wesnoth-dev
20141028 02:11:35-!- ancestral [~ancestral@mobile-198-228-233-071.mycingular.net] has quit [Remote host closed the connection]
20141028 02:13:28-!- markus_ [~mjs-de@f049106233.adsl.alicedsl.de] has joined #wesnoth-dev
20141028 02:17:35-!- mjs-de [~mjs-de@f049142004.adsl.alicedsl.de] has quit [Ping timeout: 272 seconds]
20141028 02:43:27-!- markus_ [~mjs-de@f049106233.adsl.alicedsl.de] has quit [Remote host closed the connection]
20141028 02:45:18< mattsc> shadowm: that’s disappointing
20141028 02:47:51< mattsc> shadowm: we never came to a conclusion regarding 1.12.0 vs. RC3, did we?
20141028 02:48:15< shadowm> Indeed we did not.
20141028 02:49:09< mattsc> I’m tempted to ask what you opinion is, but I’m not sure I should ...
20141028 02:49:33< mattsc> … or whether I should volunteer mine first
20141028 02:49:40< shadowm> Didn't I already state it?
20141028 02:49:56< mattsc> you said you think that we cannot be careful enough, IIRC
20141028 02:50:11< shadowm> 04:12:29 <shadowm> iceiceice: I personally feel we can't be too safe and would rather miss Debian's stable freeze than ship a completely broken initial version.
20141028 02:50:19< shadowm> Yes.
20141028 02:50:32< mattsc> okay, my gut feeling says RC3 as well
20141028 02:50:40< iceiceice> yeah i think RC3 is the prudent course
20141028 02:50:55< mattsc> I made a list of things I would still like to take care of, or have somebody else take care of, and it’s longer that I’d like it to be.
20141028 02:51:08< mattsc> That’s in addition to some things simply not being tested yet.
20141028 02:51:43< mattsc> Alright
20141028 02:52:10< mattsc> Does that mean that we will not put anything into the next Debian stable or could we put something like 1.11.18 in?
20141028 02:53:47< shadowm> https://packages.debian.org/sid/wesnoth-1.11 <- 1.11.18 will most likely land.
20141028 02:54:45< shadowm> I don't know whether the release team would make an exception for 1.11.19 if the packager uploaded it after the freeze, but 1.12.0 is most likely out of the question due to the new package names.
20141028 02:54:59< mattsc> I see - so that’s good except for that it uses the wrong MP server, right?  Or am I confusing things here again?
20141028 02:55:03< mattsc> right
20141028 02:55:06< shadowm> Yes, you are confusing things.
20141028 02:55:17< shadowm> All Wesnoth versions connect to port 15000 on server.wesnoth.org.
20141028 02:55:20< mattsc> okay - it’s the user directory which as not been renamed yet?
20141028 02:55:30< shadowm> We are in control of deciding what server instance they get redirected to.
20141028 02:56:00< mattsc> ah, right ...
20141028 02:56:28< mattsc> Cool
20141028 02:56:32< shadowm> The stable 1.12 instance (which does not currently exist) will support 1.11.17 onwards.
20141028 02:56:45< shadowm> The dev 1.11 instance already supports 1.11.17 onwards.
20141028 02:57:10< shadowm> As for the user data dir, yes, it'd be .local/share/wesnoth/1.11 rather than 1.12.
20141028 02:57:57< mattsc> right:  http://forums.wesnoth.org/viewtopic.php?f=5&t=41074#p576619
20141028 02:58:18< mattsc> :P  I’m always appalled by the things I don’t know, or don’t remember.
20141028 02:58:20< shadowm> All that above notwithstanding, I'm sure that when the time comes, Wesnoth 1.12 or even 1.13.x will become available in jessie-backports.
20141028 02:59:25< shadowm> That is, after jessie becomes the new stable, who knows when in 2015 (probably Q2 or Q3 I'd say).
20141028 03:04:46-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 250 seconds]
20141028 03:04:51< mattsc> Okay, given all that, and if anybody asked me, I’d say let’s go for RC3 on or around Nov 7, and for 1.12.0 a week after that.
20141028 03:06:39-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev
20141028 03:10:43-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20141028 03:26:59-!- Ivanovic_ [~ivanovic@frnk-5f74d355.pool.mediaWays.net] has joined #wesnoth-dev
20141028 03:30:19-!- Ivanovic [~ivanovic@frnk-5f75343b.pool.mediaWays.net] has quit [Ping timeout: 244 seconds]
20141028 03:30:36-!- sachith500|2 [~kvirc@112.135.161.223] has joined #wesnoth-dev
20141028 03:30:54-!- Ivanovic_ is now known as Ivanovic
20141028 03:33:37-!- sachith500 [~kvirc@112.134.174.43] has quit [Ping timeout: 260 seconds]
20141028 03:33:37-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Ping timeout: 245 seconds]
20141028 04:09:35-!- oldlaptop [~quassel@50-108-67-218.adr01.mskg.mi.frontiernet.net] has quit [Ping timeout: 244 seconds]
20141028 04:23:45-!- sachith500|2 [~kvirc@112.135.161.223] has quit [Read error: Connection reset by peer]
20141028 04:39:09-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: Bye for now]
20141028 04:39:28-!- oldlaptop [~quassel@50-108-67-218.adr01.mskg.mi.frontiernet.net] has joined #wesnoth-dev
20141028 04:56:07-!- kex [~kex@78.157.29.160] has quit [Remote host closed the connection]
20141028 05:14:27-!- {V} [~V@72-69-ftth.on.nl] has quit [Ping timeout: 245 seconds]
20141028 05:15:04-!- {V} [~V@72-69-ftth.on.nl] has joined #wesnoth-dev
20141028 05:15:28-!- irker808 [~irker@fehu.ai0867.net] has joined #wesnoth-dev
20141028 05:15:28< irker808> wesnoth: Ignacio R. Morelle wesnoth:1.12 a1fe3ce3fc76 / / (7 files in 6 dirs): Spanish translation update http://git.io/sTaRag
20141028 05:15:31< irker808> wesnoth: Ignacio R. Morelle wesnoth:master 1d41b1533b24 / po/ (5 files in 5 dirs): Spanish translation update http://git.io/WIwCkg
20141028 05:28:42-!- Sulfur [~Miranda@p5B3278A5.dip0.t-ipconnect.de] has joined #wesnoth-dev
20141028 05:30:10< irker808> wesnoth: Ignacio R. Morelle website:master d6788f986bef / start/1.12/ (index.es.html po/es.po): Spanish 1.12 announcement translation update http://git.io/lByNyw
20141028 05:34:15-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has joined #wesnoth-dev
20141028 05:50:51-!- sachith500|2 [~kvirc@112.135.161.223] has joined #wesnoth-dev
20141028 06:00:22-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has quit [Quit: End Transmission.]
20141028 06:28:22< vultraz> The Falcon race is missing a race icon for the editor
20141028 06:31:18< vultraz> I'll PM LordBob
20141028 06:43:18< vultraz> PM'ed
20141028 06:44:30-!- kex [~kex@78.157.29.160] has joined #wesnoth-dev
20141028 06:47:48-!- zookeeper [zookeeper@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20141028 06:49:37-!- kex [~kex@78.157.29.160] has quit [Ping timeout: 255 seconds]
20141028 07:07:13-!- sachith500|2 [~kvirc@112.135.161.223] has quit [Ping timeout: 256 seconds]
20141028 07:30:55-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has quit [Quit: Leaving]
20141028 07:45:30-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20141028 07:59:09-!- Coffee_irc [~david@ppp118-210-90-49.lns20.adl2.internode.on.net] has joined #wesnoth-dev
20141028 08:15:34-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Remote host closed the connection]
20141028 08:30:17-!- irker808 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout]
20141028 08:33:33-!- kex [~kex@78.157.29.160] has joined #wesnoth-dev
20141028 08:38:09-!- kex [~kex@78.157.29.160] has quit [Ping timeout: 258 seconds]
20141028 08:47:05-!- Guest39355 is now known as Haudegen
20141028 08:56:47-!- kex [~kex@78.157.29.160] has joined #wesnoth-dev
20141028 09:01:20-!- kex [~kex@78.157.29.160] has quit [Ping timeout: 256 seconds]
20141028 09:13:41-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 272 seconds]
20141028 09:18:36-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev
20141028 09:27:36-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Ping timeout: 258 seconds]
20141028 09:51:59-!- Anakonda [Anakonda@87-92-249-75.bb.dnainternet.fi] has joined #wesnoth-dev
20141028 10:04:49-!- sachith500 [~kvirc@112.135.11.202] has joined #wesnoth-dev
20141028 10:11:46-!- sachith500 [~kvirc@112.135.11.202] has quit [Ping timeout: 244 seconds]
20141028 10:14:08-!- sachith500 [~kvirc@112.134.235.163] has joined #wesnoth-dev
20141028 10:21:53-!- bumbadadabum [~bumbadada@wcw-stud-145-109-8-115.wireless.uva.nl] has joined #wesnoth-dev
20141028 10:24:47-!- sachith500 [~kvirc@112.134.235.163] has quit [Ping timeout: 264 seconds]
20141028 10:47:38-!- kex [~kex@78.157.29.160] has joined #wesnoth-dev
20141028 10:48:24-!- Coffee_irc [~david@ppp118-210-90-49.lns20.adl2.internode.on.net] has quit [Quit: Konversation terminated!]
20141028 11:12:56-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20141028 11:24:36-!- Sulfur [~Miranda@p5B3278A5.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer]
20141028 11:38:36-!- sachith500 [~kvirc@112.134.221.165] has joined #wesnoth-dev
20141028 11:50:17-!- bumbadadabum [~bumbadada@wcw-stud-145-109-8-115.wireless.uva.nl] has quit [Ping timeout: 255 seconds]
20141028 11:52:55-!- mjs-de [~mjs-de@f049106233.adsl.alicedsl.de] has joined #wesnoth-dev
20141028 12:02:31-!- Sulfur [~Miranda@p5B3278A5.dip0.t-ipconnect.de] has joined #wesnoth-dev
20141028 12:16:34-!- bumbadadabum [~bumbadada@wcw-stud-145-109-8-115.wireless.uva.nl] has joined #wesnoth-dev
20141028 12:24:12-!- Appleman1234 [~Appleman1@pool-173-74-87-52.dllstx.fios.verizon.net] has quit [Ping timeout: 250 seconds]
20141028 12:35:03-!- kex [~kex@78.157.29.160] has quit [Remote host closed the connection]
20141028 12:40:01-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20141028 12:56:12-!- kex [~kex@46.217.86.169] has joined #wesnoth-dev
20141028 13:21:54-!- mjs-de [~mjs-de@f049106233.adsl.alicedsl.de] has quit [Ping timeout: 244 seconds]
20141028 13:34:55-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev
20141028 13:38:16-!- prkc [~prkc@4E5C2C2A.dsl.pool.telekom.hu] has joined #wesnoth-dev
20141028 13:38:58-!- mjs-de [~mjs-de@f049106233.adsl.alicedsl.de] has joined #wesnoth-dev
20141028 13:49:48-!- bumbadadabum [~bumbadada@wcw-stud-145-109-8-115.wireless.uva.nl] has quit [Ping timeout: 244 seconds]
20141028 13:56:52-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20141028 14:05:14-!- irker969 [~irker@fehu.ai0867.net] has joined #wesnoth-dev
20141028 14:05:14< irker969> wesnoth: mattsc wesnoth:1.12 66c1f9d786f5 / data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg: LoW 03: fix two issues with fog http://git.io/l_ircA
20141028 14:06:37< mattsc> zookeeper: indeed a silly little oversight ^
20141028 14:07:02-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20141028 14:08:32< vultraz> So are we still aiming for the 1st for 1.12.0?
20141028 14:08:45< mattsc> no
20141028 14:13:34< vultraz> What's the new eta?
20141028 14:16:00-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: Computer's napping]
20141028 14:31:08-!- mjs-de [~mjs-de@f049106233.adsl.alicedsl.de] has quit [Remote host closed the connection]
20141028 14:33:50-!- mjs-de [~mjs-de@f049106233.adsl.alicedsl.de] has joined #wesnoth-dev
20141028 14:36:20-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev
20141028 14:37:25< mattsc> vultraz: two weeks later
20141028 14:45:38-!- sachith500 [~kvirc@112.134.221.165] has quit [Read error: Connection reset by peer]
20141028 14:47:03-!- sachith500 [~kvirc@112.134.221.165] has joined #wesnoth-dev
20141028 14:47:17-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev
20141028 14:47:33-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20141028 14:53:41-!- kex [~kex@46.217.86.169] has quit [Remote host closed the connection]
20141028 14:53:59< zookeeper> mattsc, ha :P
20141028 14:54:17< mattsc> zookeeper: agreed
20141028 14:57:37-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has joined #wesnoth-dev
20141028 15:01:20-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has joined #wesnoth-dev
20141028 15:11:26-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20141028 15:18:52-!- kex [~kex@46.217.86.169] has joined #wesnoth-dev
20141028 15:22:51< mattsc> thunderstruck, fendrin, shadowm, loonycyborg: there are “assignments” for all of you in the message I just sent to the ML. 
20141028 15:23:24< mattsc> I believe you are all aware of all of those tasks, so it’s really just a reminder and for having it all in one place in one list.
20141028 15:25:34< vultraz> mattsc: so we're keeping os x compatibility as far back as Leopard?
20141028 15:25:58< mattsc> vultraz: for 1.12 at least, yes
20141028 15:27:09< fendrin> mattsc: homework for me?
20141028 15:27:56< vultraz> mattsc: is that worth it? I'm just wondering, I haven't used os x in forever.
20141028 15:28:07< mattsc> fendrin: yes, but no new homework.  You know about all of it, i just compiled it all in one place.
20141028 15:28:20< fendrin> fine, thank you
20141028 15:28:53< mattsc> fendrin: I’ve also commited a few minor bug fixes to LoW S3.
20141028 15:29:17< mattsc> fendrin: and I am in the middle of doing a sort-of-playthrough of the campaign in SP mode.
20141028 15:29:31< fendrin> mattsc: Good to hear.
20141028 15:29:40< mattsc> I’m debug cheating my way through, but I am doing a bit more than just using debug-n all the time.
20141028 15:29:42 * vultraz takes a look at LoW's code out of curiosity
20141028 15:30:12< mattsc> fendrin: I’m also checking out the WML to make sure I know which events are supposed to fire (and then test those).
20141028 15:30:48< mattsc> vultraz: yes, it is.  There are still “lots” of people out there playing Wesnoth on 10.5.  And it’s really not that hard to do.
20141028 15:31:14< mattsc> I just need to recompile the boost libraries with 10.5 support.  I have instructions for how to do that somewhere, I think.
20141028 15:31:40< vultraz> mattsc: huh. Guess I underestimate the number of people who use older os'es
20141028 15:55:33-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev
20141028 15:55:47< iceiceice> 20141028 01:47:03< mattsc> ancestral: will that mean that I eventually won’t have to produce OS X release packages any more?
20141028 15:55:57< iceiceice> 20141028 01:48:55< mattsc> Will the builds work for OS X 10.5?
20141028 15:57:40< iceiceice> i think the main homebrew only supports OS X 10.6 and up,
20141028 15:57:53< iceiceice> there's apparently an experimental fork called "tigerbrew" to support older versions
20141028 15:57:54< iceiceice> https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Installation.md#2
20141028 15:58:44< iceiceice> homebrew is a lot easier for us to maintain, in the sense that it gathers the dependencies and automatically updates them without us saying anything
20141028 15:59:06< iceiceice> e.g. if someone is using homebrew and they get a bad boost library or something, thats a bug in homebrew not our fault
20141028 15:59:26< iceiceice> in homebrew all you say is "depends_on boost" in your package and then it will give the latest stable boost version
20141028 15:59:50< iceiceice> likewise it installs pango cairo and SDL and all that
20141028 16:00:34< iceiceice> it still requires someone to keep an eye on it,
20141028 16:01:17< iceiceice> if we get it working well and you don't want to release official os x packages anymore that would seem to be an option
20141028 16:02:42< iceiceice> but it would take a little extra work to keep support for OS X 10.5
20141028 16:05:11< iceiceice> also, just browsing the tigerbrew issues page,
20141028 16:05:35< iceiceice> it seems like it might be even less developed than linuxbrew if they have issues like this: https://github.com/mistydemeo/tigerbrew/issues/228
20141028 16:05:51-!- lipkab [~lipkab@host-91-147-211-128.biatv.hu] has joined #wesnoth-dev
20141028 16:06:22-!- kex [~kex@46.217.86.169] has quit [Remote host closed the connection]
20141028 16:09:24< c74d> MacPorts theoretically supports everything from Apple OS X 10.10 to back to Mac OS X 10.4.
20141028 16:09:25-!- kex [~kex@46.217.86.169] has joined #wesnoth-dev
20141028 16:11:16< iceiceice> how hard is it to make a macports?
20141028 16:11:24< iceiceice> *support for wesnoth that is
20141028 16:13:18< vultraz> I believe I tried once. Not...easy.
20141028 16:13:44< iceiceice> wow we apparently have a mac ports entry also: https://trac.macports.org/browser/trunk/dports/games/wesnoth/Portfile
20141028 16:36:33< c74d> Ah, currently unmaintained.
20141028 16:37:10< iceiceice> well if it still works maybe someone can shoehorn in a reference to 1.12
20141028 16:37:15< c74d> I doubt Portfiles are really more difficult than whatever Homebrew has.
20141028 16:37:31< iceiceice> c74d: homebrew is just ruby
20141028 16:37:38< c74d> (MacPorts uses TCL, Homebrew is… that.)
20141028 16:37:45< iceiceice> its impossible for me to test any of this stuff myself...
20141028 16:38:12< iceiceice> linuxbrew isn't able to install pango-cairo
20141028 16:38:33< iceiceice> i guess maybe i could hack in some symlinks or something to point it to my system installed pango-cairo...
20141028 16:38:34-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20141028 16:39:25< c74d> Has BfW accrued additional dependencies since 1.10.7?
20141028 16:39:52< iceiceice> yes but only boost
20141028 16:40:18< c74d> Which it already has there, okay.
20141028 16:40:21< iceiceice> it looks that both macports and homebrew treat boost just as a unit
20141028 16:41:17< iceiceice> hmm maybe we need lib bz2 now?
20141028 16:42:11< iceiceice> i wonder what their patch is to our cmake file
20141028 16:44:10< c74d> Boost doesn’t seem to distribute their component libraries individually, so I imagine packaging them individually would be inconvenient.
20141028 16:45:00< iceiceice> thats what linux does though
20141028 16:45:40-!- gfgtdf [~chatzilla@e179209021.adsl.alicedsl.de] has joined #wesnoth-dev
20141028 16:48:05< c74d> Linux? The only thing Linux has to do with packaging is that it itself gets packaged. Some specific packaging systems intended for use with Linux might split up Boost, but if I’ve encountered any that do, I don’t recall them.
20141028 16:48:40< c74d> Ah, APT seems to.
20141028 16:49:39 * c74d found APT annoying and didn’t care enough to inspect it closely. >_>
20141028 16:50:36< iceiceice> c74d: ok by this i mean, debian and ubuntu split up boost
20141028 16:50:59< iceiceice> and although i dont know it for a fact, other random crap i've read suggests to me that gentoo does also (and probably everyone else)
20141028 16:52:47< c74d> I have a Gentoo Linux system around here somewhere… no, the only thing it splits out of Boost is Boost’s build tool.
20141028 16:53:59< iceiceice> ok, good to know
20141028 16:54:43< c74d> Arch Linux doesn’t seem to split it either.
20141028 16:58:14< iceiceice> c74d: i think the only new dep for macports is bzip2
20141028 16:58:52< mattsc> gfgtdf: the LoW bug report is for 1.11.18, which we’ve been fixing up lately.  Can you test there?
20141028 16:58:54< c74d> I suppose I could try to update the Portfile.
20141028 16:59:17< c74d> I use MacPorts, but I don’t use BfW.
20141028 17:00:01< c74d> (I wouldn’t know how to test its run-time functionality, but I could at least make sure it builds.)
20141028 17:03:02-!- sachith500 [~kvirc@112.134.221.165] has quit [Ping timeout: 255 seconds]
20141028 17:05:11-!- irker969 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout]
20141028 17:10:16< iceiceice> c74d: ok cool
20141028 17:10:27< iceiceice> i am going to apply their cmake patch i think,
20141028 17:10:29< iceiceice> and also to 1.12,
20141028 17:10:46< iceiceice> so it shouldn't require any macports patches
20141028 17:10:49< c74d> Oh, I’m not saying I’ll do it. I don’t know that I’ll have time soon.
20141028 17:11:19< c74d> I suppose I could edit the thing locally now and see whether it builds, though.
20141028 17:11:52< c74d> But I expect actually updating the official copy would take some figurative paperwork.
20141028 17:12:10< iceiceice> yeah, whenever you have time
20141028 17:12:18< c74d> I’m willing to try, when I do.
20141028 17:16:31< iceiceice> hmm i'm getting linker errors now with cmake on master...
20141028 17:16:39< iceiceice> unfortunately i dont have time to deal with this
20141028 17:20:03-!- kex [~kex@46.217.86.169] has quit [Remote host closed the connection]
20141028 17:21:50-!- kex [~kex@46.217.86.169] has joined #wesnoth-dev
20141028 17:25:49-!- Gallaecio [~quassel@84.120.180.152.dyn.user.ono.com] has joined #wesnoth-dev
20141028 17:26:23-!- kex [~kex@46.217.86.169] has quit [Ping timeout: 258 seconds]
20141028 17:33:00-!- kex [~kex@46.217.86.169] has joined #wesnoth-dev
20141028 17:44:22-!- lipkab [~lipkab@host-91-147-211-128.biatv.hu] has quit [Ping timeout: 255 seconds]
20141028 17:55:05-!- Sulfur [~Miranda@p5B3278A5.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer]
20141028 18:01:43-!- veronicas [81c20849@gateway/web/freenode/ip.129.194.8.73] has joined #wesnoth-dev
20141028 18:02:50< veronicas> Hello, I am a student at university of Geneva and I am preparing my master thesis about open source video games. I would like to know if there's any developer of the game who would answer my (confidential) survey.
20141028 18:10:15-!- thunderstruck [~zaibotren@cpc8-sgyl29-2-0-cust37.sgyl.cable.virginm.net] has joined #wesnoth-dev
20141028 18:11:22< zookeeper> veronicas, sure
20141028 18:14:23< veronicas> Thank you so much, zookeeper! My survey is still under development, but I'll finish it very soon and I'll publish it through Limesurvey, so I would need an email address to send the link. The survey won't take long. If you do not wish to publish your email address here, you can send me an email to me and I'll register your address and send you the link. My institutional addres is: sanchma6@etu.unige.ch
20141028 18:22:27< zookeeper> did you get it?
20141028 18:25:25-!- lipkab [~lipkab@host-91-147-211-128.biatv.hu] has joined #wesnoth-dev
20141028 18:26:25< veronicas> Not yet, I have checked my spam also and nothing yet.
20141028 18:26:59< zookeeper> i mean the msg i sent you here
20141028 18:27:27< zookeeper> i don't know which irc client you're using, but look around, it should be there somewhere :p
20141028 18:33:56-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has quit [Ping timeout: 255 seconds]
20141028 18:35:14-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev
20141028 18:37:42-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has joined #wesnoth-dev
20141028 18:38:28< veronicas> Oh, I didn't get any message here. I am at webchat.freenode.net
20141028 18:39:00-!- fendrin [~quassel@wesnoth/developer/fendrin] has quit [Ping timeout: 265 seconds]
20141028 18:40:00-!- fendrin [~quassel@p20030051AA6C19322D9EE687F89AB085.dip0.t-ipconnect.de] has joined #wesnoth-dev
20141028 18:40:00-!- fendrin [~quassel@p20030051AA6C19322D9EE687F89AB085.dip0.t-ipconnect.de] has quit [Changing host]
20141028 18:40:00-!- fendrin [~quassel@wesnoth/developer/fendrin] has joined #wesnoth-dev
20141028 18:41:29-!- kex [~kex@46.217.86.169] has quit [Remote host closed the connection]
20141028 18:42:09-!- kex [~kex@46.217.86.169] has joined #wesnoth-dev
20141028 18:46:22-!- kex [~kex@46.217.86.169] has quit [Ping timeout: 240 seconds]
20141028 18:47:41-!- ancestral [~ancestral@63.92.240.233] has quit [Quit: i go nstuf kthxbai]
20141028 18:51:00-!- veronicas [81c20849@gateway/web/freenode/ip.129.194.8.73] has left #wesnoth-dev []
20141028 18:59:51< gfgtdf> fendrin: i thought about https://gna.org/bugs/?22881 and do you think it's posible to replace the "time over" event in that scenario with some "turn n end" event ?
20141028 19:01:46< fendrin> gfgtdf: Yes, looks like a workaround. Isn't it better to fix the c++ backend?
20141028 19:01:54-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev
20141028 19:02:24< fendrin> gfgtdf: I mean, the fix destroys a test case of a valid bug.
20141028 19:03:19< gfgtdf> fendrin: you mena teh "time over"not replay-save or another bug ?
20141028 19:03:41< fendrin> yes
20141028 19:06:00-!- riksteri [~riksteri@dsl-tkubrasgw3-54f96b-216.dhcp.inet.fi] has joined #wesnoth-dev
20141028 19:07:50< gfgtdf> fendrin: for 1.13 we coudl just add a test case for this in the wml unit test. I dont say it impossible to fis this on the c++ side, but i just cannot guarantee.
20141028 19:08:30< fendrin> gfgtdf: I am fine with using the workaround.
20141028 19:09:24-!- fendrin [~quassel@wesnoth/developer/fendrin] has quit [Remote host closed the connection]
20141028 19:16:41< gfgtdf> fendrin: ok i hvae a possible fix for master i'll test it with the  replay in the bug report
20141028 19:20:15-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20141028 19:26:51< mattsc> gfgtdf, iceiceice: there isn’t a general problem if I did the OS X releases without your new filesystem code, is there?
20141028 19:27:42< gfgtdf> mattsc: coudl you please test whether the image transltions work ?
20141028 19:27:43< mattsc> The problem is that we are supporting OS X 10.5, and boost_locale requires something that is not in the 10.5 SDKs  (assuming I understand all this correctly)
20141028 19:28:39< gfgtdf> mattsc: but i thougth you have boost 1.53 ?
20141028 19:28:40< mattsc> gfgtdf: you mean if I do not use the new FS code?
20141028 19:28:49< gfgtdf> mattsc: y
20141028 19:29:23< mattsc> gfgtdf: the problem is not that locale is not there; it’s that local requires some other library that’s not in the SDK, or something like that
20141028 19:30:33< iceiceice> mattsc: the boost locale page has some notes:
20141028 19:30:35< iceiceice> "If iconv library is not found on Darwin/Mac OS X builds make sure there is no multiple iconv installations and provide -sICONV_PATH build option to point to correct location of iconv library."
20141028 19:30:35< mattsc> gfgtdf: well, I can try the image translation with one of the previous releases, which was all before the new fs code.  So what should I check?  Whether the map in the title screen is translated?
20141028 19:30:40< iceiceice> http://www.boost.org/doc/libs/1_48_0/libs/locale/doc/html/building_boost_locale.html
20141028 19:31:03< mattsc> iceiceice: okay - yes, that is the problem
20141028 19:31:24< mattsc> but it only happens when I am trying to build with for 10.5, not for the later versions
20141028 19:32:19< mattsc> gfgtdf: yes, title screen map is translated in 1.11.18
20141028 19:32:58< gfgtdf> mattsc: ok i currently dont remember anything else that we adjuasted for the bfs code.
20141028 19:33:06< mattsc> in 1.11.16 also (just to be sure)
20141028 19:34:55-!- irker219 [~irker@fehu.ai0867.net] has joined #wesnoth-dev
20141028 19:34:55< irker219> wesnoth: gfgtdf wesnoth:master 52fb0597273f / src/replay_controller.cpp: fix "time over" event in replays http://git.io/e5Vz9w
20141028 19:34:57-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20141028 19:35:22< gfgtdf> fendrin: ^
20141028 19:36:02< mattsc> gfgtdf: well, it works for German, not for Spanish…  (but I don’t know if the map labels are translated into Spanish yet)
20141028 19:36:44< gfgtdf> mattsc: but for spanish (unlike german) the loadscreen  is translated.
20141028 19:37:22< mattsc> gfgtdf: ?
20141028 19:37:24< gfgtdf> mattsc: the logo image  mean
20141028 19:37:34< gfgtdf> mattsc: that appears during reloading wml
20141028 19:37:38< mattsc> gfgtdf: oh, yes, it is
20141028 19:38:09-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Ping timeout: 272 seconds]
20141028 19:39:07< mattsc> gfgtdf: same for the text in the icon in the top of the title screen: translated in Spanish, not in German
20141028 19:39:26< mattsc> so it looks like it works in general, depending only on whether the translation exists
20141028 19:39:47< gfgtdf> mattsc: y thats what i think too
20141028 19:39:55< mattsc> I will still check out the link iceiceice sent; maybe I can figure it out
20141028 19:40:16< mattsc> but at least I have a fall-back option now
20141028 19:40:24< iceiceice> yeah
20141028 19:42:45-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20141028 19:47:42-!- noy [~Noy@wesnoth/developer/noy] has quit [Ping timeout: 265 seconds]
20141028 19:54:23-!- kex [~kex@46.217.86.169] has joined #wesnoth-dev
20141028 20:02:19-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev
20141028 20:10:05-!- riksteri [~riksteri@dsl-tkubrasgw3-54f96b-216.dhcp.inet.fi] has quit [Read error: Connection reset by peer]
20141028 20:10:10-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev
20141028 20:35:48-!- ancestral [~ancestral@63.92.240.233] has quit [Quit: i go nstuf kthxbai]
20141028 20:37:50-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev
20141028 21:15:58-!- molgrum [~molgrum@212.85.89.43] has quit [Quit: Lämnar]
20141028 21:26:29-!- kex [~kex@46.217.86.169] has quit [Ping timeout: 245 seconds]
20141028 21:36:51-!- Dugi [93fbd29f@gateway/web/freenode/ip.147.251.210.159] has joined #wesnoth-dev
20141028 21:38:00-!- kex [~kex@46.217.86.169] has joined #wesnoth-dev
20141028 21:38:14< Dugi> Hello.
20141028 22:03:53-!- trewe [~trewe@2.81.42.229] has joined #wesnoth-dev
20141028 22:04:49-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: Computer's napping]
20141028 22:12:07< iceiceice> hi Dugi
20141028 22:14:59-!- Kexoth [~kex@46.217.82.139] has joined #wesnoth-dev
20141028 22:16:33-!- gfgtdf_ [~chatzilla@f054164109.adsl.alicedsl.de] has joined #wesnoth-dev
20141028 22:17:22-!- kex [~kex@46.217.86.169] has quit [Ping timeout: 240 seconds]
20141028 22:18:04-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20141028 22:19:27-!- gfgtdf [~chatzilla@e179209021.adsl.alicedsl.de] has quit [Ping timeout: 244 seconds]
20141028 22:19:30-!- gfgtdf_ is now known as gfgtdf
20141028 22:20:14< Dugi> Does anybody know how can I remove the first of several patches on a git branch, undoing the changes?
20141028 22:21:07< irker219> wesnoth: gfgtdf wesnoth:master 40c1448e6742 / src/savegame.cpp: fix start-of-scenario 1.13 compability (#22546) http://git.io/boLD5w
20141028 22:21:44< iceiceice> Dugi: there's several ways to do this,
20141028 22:21:50< gfgtdf> Dugi you can eigher do so by release  -i removing that commit, or using revert that creates a seconsd commit that undoes that changes.
20141028 22:21:51< iceiceice> one is "git reset --hard HEAD^"
20141028 22:22:04< iceiceice> or using "git rebase -i (master)"
20141028 22:22:07< iceiceice> or git revert
20141028 22:22:19< iceiceice> you can also use git reflog 
20141028 22:22:38< iceiceice> that will let you undo commits, and also even bad resets / rebases
20141028 22:22:52< loonycyborg> reset --hard is the simplest I think
20141028 22:22:53< shadowm> The first one resets the branch to the previous commit, which doesn't sound like what Dugi wants.
20141028 22:23:19< shadowm> Mostly because he said first, not last.
20141028 22:23:27-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20141028 22:25:57< iceiceice> oh
20141028 22:26:04< iceiceice> yeah i guess it depends how you think about it
20141028 22:26:14< Dugi> I need to remove the first, not last.
20141028 22:26:30< iceiceice> Dugi: if you want to remove commits buried in history, best thing is to look on the stack overflow page about this,
20141028 22:26:36< iceiceice> theres an extremely comprehensive one
20141028 22:27:18< Dugi> Do you have it bookmarked?
20141028 22:27:19< iceiceice> actually this is the one i'm thinking of:
20141028 22:27:20< iceiceice> http://stackoverflow.com/questions/4307095/git-how-to-split-up-a-commit-buried-in-history
20141028 22:27:24< iceiceice> so its something a little different
20141028 22:27:31< iceiceice> removing a commit is a bit simpler
20141028 22:27:58< Dugi> Thanks.
20141028 22:28:03< c74d> Dugi: You have a branch X which has commits A -> B -> C, and a branch Y that goes […] -> C -> D -> E -> F, and you want to delete D from Y?
20141028 22:28:35< c74d> I would use `git rebase -i X Y`, and delete the line representing D.
20141028 22:28:53< Dugi> c74d: I don't need that, just to remove the A from the A -> B -> C
20141028 22:29:52< c74d> Ah, more generally, `git rebase -i <commit to delete>~ <branch name>`
20141028 22:30:36< c74d> (Note the ‘~’.)
20141028 22:33:52-!- Dugi_ [93fbd29f@gateway/web/freenode/ip.147.251.210.159] has joined #wesnoth-dev
20141028 22:35:01< Dugi_> Dammit, accidentally logged out.
20141028 22:35:07-!- Dugi [93fbd29f@gateway/web/freenode/ip.147.251.210.159] has quit [Ping timeout: 246 seconds]
20141028 22:36:52-!- Dugi_ is now known as Dugi
20141028 22:37:38< Dugi> I tried that command, but it told me that it needs a single revision. The command I used was git rebase -i ~0693d9e 134
20141028 22:37:57-!- fabi [~quassel@p20030051AA6C19324057942EA5CA715B.dip0.t-ipconnect.de] has joined #wesnoth-dev
20141028 22:37:57-!- fabi [~quassel@p20030051AA6C19324057942EA5CA715B.dip0.t-ipconnect.de] has quit [Changing host]
20141028 22:37:57-!- fabi [~quassel@wesnoth/developer/fendrin] has joined #wesnoth-dev
20141028 22:38:20< iceiceice> Dugi: i think it needs the ~ at the end of the commit number rather than in front,
20141028 22:38:34< iceiceice> i'm not totally sure, i'm actually not really clear on what the difference is between ^ and ~ in git
20141028 22:38:39< Dugi> Yeah, that was it.
20141028 22:39:06< Dugi> Now it tellls that invalid branch 134, what should I write if the branch is wesnoth pull request number 134?
20141028 22:40:33< fabi> hi Dugi
20141028 22:41:03< c74d> Dugi: it looks like the GitHub pull request was made for your branch `dugi/addon_reviews`, so try that branch.
20141028 22:41:12< Dugi> Fabi: Hi, haven't seen you for quite a while.
20141028 22:41:40< fabi> Dugi: Yeah, I wasn't around match during the last 3 month.
20141028 22:41:47< fabi> s/match/much
20141028 22:43:15< Dugi> c74b: it tells that I have some unstaged changes, when I hit git status it lists about thirty changes I surely didn't do.
20141028 22:43:46< iceiceice> Dugi: does git status say that you are in the middle of a rebase?
20141028 22:44:22< iceiceice> (i.e. does it suggst that you might want to use "git rebase --abort" or "git rebase --continue" ?)
20141028 22:44:55< Dugi> iceiceice: No, before it told me that I cannot rebase and mentioned nothing about rebasing in the git status text.
20141028 22:45:28< iceiceice> does it say that you are at the head of your addon_reviews branch?
20141028 22:45:37< Dugi> iceiceice: The rebase attempt just told me that I have unstaged changes and that I should commit or stash them.
20141028 22:45:50< iceiceice> yeah, you need to get a clean slate before starting to rebase
20141028 22:46:01< iceiceice> were there changes on your HEAD when you started working?
20141028 22:46:10< Dugi> iceiceice: No, that On branch dugi/addon_reviews and that it's up-to-date with the fork.
20141028 22:46:23< Dugi> I haven't done these changes it lists.
20141028 22:46:43< iceiceice> what happens when you type git checkout dugi/addon_reviews
20141028 22:47:12< iceiceice> does it just say you have unstashed changes?
20141028 22:47:26< iceiceice> basically you have to decide if you want to keep the changes or abandon them i guess
20141028 22:48:27< iceiceice> if you want to abandon them you can do "git reset --hard HEAD" which will force your work directory to match whereever HEAD is pointing, discarding any uncommitted stuff
20141028 22:48:46< iceiceice> if you think its work you forgot about, then you probably want to make a new branch and commit it there
20141028 22:49:22< Dugi> Git checkout lists the same changes I haven't done, telling that it's up-to-date.
20141028 22:50:01< Dugi> I am pretty sure I wasn't editing these files, I have no idea what most of them do 
20141028 22:50:14< Dugi> And I am pretty sure that all I wanted was comitted.
20141028 22:50:24< Dugi> So, I suppose that I will have to reset it.
20141028 22:50:40< iceiceice> it might be a merge gone wrong or something
20141028 22:50:58< iceiceice> if you tried to pull master into your branch then you might get a bunch of stuff
20141028 22:51:51< Dugi> I haven't done anything with it for months.
20141028 22:52:21< Dugi> So I am quite sure that I can't remember what was I trying back then.
20141028 22:53:35< Dugi> Anyway, the fact is that I coped the whole working folder from my old laptop to my new laptop.
20141028 22:53:42< Dugi> *copied
20141028 22:53:53< Dugi> So it maybe produced some file damage.
20141028 22:53:55< iceiceice> did you also copy the .git folder with it?
20141028 22:53:59< Dugi> I did.
20141028 22:54:03< iceiceice> hmm
20141028 22:54:07< iceiceice> yeah idk
20141028 22:54:44< Dugi> Okay, so I'll just reset it. Okay?
20141028 22:56:59-!- skyfaller [~skyfaller@ool-2f11697b.dyn.optonline.net] has joined #wesnoth-dev
20141028 22:56:59-!- skyfaller [~skyfaller@ool-2f11697b.dyn.optonline.net] has quit [Changing host]
20141028 22:56:59-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has joined #wesnoth-dev
20141028 23:01:18-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has quit [Client Quit]
20141028 23:01:46< Dugi> I got to that gir rebase, but it opens nano and asks me to edit a file, what should I edit there?
20141028 23:02:16< Dugi> I don't want to mess it up.
20141028 23:02:20< c74d> Dugi: a file that contains a list of commits?
20141028 23:03:21< Dugi> Yes.
20141028 23:03:59< c74d> Find the commit you want to delete, and delete it from the file.
20141028 23:04:18< Dugi> The whole line?
20141028 23:04:21< c74d> Then save and close, and Git should delete that commit from the branch.
20141028 23:04:23< c74d> Yes.
20141028 23:05:34< Dugi> Done, thanks.
20141028 23:06:36< Dugi> Now, probably an easier thing. Some changes were done to the files I edited by other developers while I was doing other stuff, how do I base the pull on the latest version of wesnoth?
20141028 23:10:44-!- zookeeper [zookeeper@wesnoth/developer/zookeeper] has quit [Ping timeout: 250 seconds]
20141028 23:12:09< c74d> `git checkout master; git pull --ff-only; git rebase -i master dugi/addon_reviews`
20141028 23:14:39< c74d> (Dugi ^)
20141028 23:16:14< Dugi> Seems to be working, thanks.
20141028 23:24:06< iceiceice> c74d: what does --f-only do? this automatically resolves conflicts somehow?
20141028 23:26:50< Dugi> Seems it's done. One patch could not be applied because of differences in files, but that's a C++ task.
20141028 23:27:12< Dugi> Thanks for your help, everybody.
20141028 23:27:44-!- Appleman1234 [~Appleman1@pool-173-74-87-52.dllstx.fios.verizon.net] has joined #wesnoth-dev
20141028 23:28:10< c74d> iceiceice: `--ff-only` means that Git will only “fast-forward” the pulled-into branch to the pulled branch. If branch X is A → B → C, and branch Y is A → B → C → D → E, X can be fast-forwarded to Y. If Y is A → B → K, then X can’t be fast-forwarded to Y; one would need to perform a true merge.
20141028 23:29:23< iceiceice> wait so why doesn't pull / merge always do this?
20141028 23:29:30< iceiceice> i thought that it did
20141028 23:29:52< iceiceice> hmm, maybe only in the case that the whole merge can be resolved by fast-forward...
20141028 23:32:39< c74d> They default to fast-forwarding *if possible*. (`git merge` also has a `--no-ff` option.)
20141028 23:40:36-!- mjs-de [~mjs-de@f049106233.adsl.alicedsl.de] has quit [Remote host closed the connection]
20141028 23:41:44-!- gfgtdf [~chatzilla@f054164109.adsl.alicedsl.de] has quit [Ping timeout: 255 seconds]
20141028 23:43:08-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection]
20141028 23:48:53-!- Dugi [93fbd29f@gateway/web/freenode/ip.147.251.210.159] has quit []
20141028 23:52:55-!- lipkab [~lipkab@host-91-147-211-128.biatv.hu] has quit [Ping timeout: 255 seconds]
20141028 23:56:35-!- Kexoth [~kex@46.217.82.139] has quit [Remote host closed the connection]
20141028 23:59:23-!- trewe [~trewe@2.81.42.229] has quit [Quit: quit]
--- Log closed Wed Oct 29 00:00:42 2014