Log for #openttdcoop.devzone on 9th November 2014:
Times are UTC Toggle Colours
00:30:27  *** krinn has quit IRC
05:52:56  *** Supercheese has joined #openttdcoop.devzone
07:57:31  <V453000> hm, my firefox fails to download from devzone, IE downloads but strangely slowly
07:57:35  <V453000> is something going on there? :D
08:04:02  *** Taede_ has joined #openttdcoop.devzone
08:10:21  *** Taede has quit IRC
08:30:59  *** LSky` has joined #openttdcoop.devzone
08:34:46  *** Taede_ is now known as Taede
08:43:23  *** yorick_ has joined #openttdcoop.devzone
08:45:58  *** Alberth has joined #openttdcoop.devzone
08:51:09  *** yorick has quit IRC
09:39:17  <planetmaker> V453000, any particular URL? Or did it sort itself?
09:39:35  <V453000> any file I uploaded to nuts Files so far
09:39:38  <V453000> were various files
09:39:43  <V453000> all around 14MB
09:40:14  <V453000>
09:44:44  <planetmaker> fast for me
09:48:37  <Alberth> hi hi
09:48:50  <planetmaker> hi hi :)
10:34:11  <DevZone> Project xussrset - Trains from Russia build #539-push: SUCCESS in 4 min 16 sec:
10:37:23  *** oskari89 has joined #openttdcoop.devzone
11:07:40  *** Zuu has joined #openttdcoop.devzone
11:12:43  *** oskari892 has joined #openttdcoop.devzone
11:19:52  *** oskari89 has quit IRC
11:26:54  *** gelignite has joined #openttdcoop.devzone
11:32:29  *** frosch123 has joined #openttdcoop.devzone
12:27:13  <DevZone> Yippee, build fixed!
12:27:13  <DevZone> Project opengfx-mars build #183-push: FIXED in 3 min 11 sec:
12:37:39  *** Supercheese has quit IRC
14:36:45  *** erlehmann has joined #openttdcoop.devzone
15:51:25  <Alberth> ha, new way to break makefiles :p
15:51:56  <planetmaker> hm?
15:54:22  <Alberth>
15:55:35  <Alberth> [defaults]
15:55:35  <Alberth> log  = -G --limit=5    <-- my 'log' defaults
15:57:19  *** erlehmann has quit IRC
16:08:25  <planetmaker> ah... that reminds me... I thought of that possibility just hte other day. And I know the fix :P
16:08:44  <planetmaker> Alberth, can you try for me amending Makefile?
16:09:02  <Alberth> amending?
16:09:05  <planetmaker> change the lines with $(HG) to use HGPLAIN= $(HG)
16:09:21  <planetmaker> does the error you encounter appear then, too?
16:09:58  <planetmaker> besides that, the [defaults] section is considered deprectated, I think. I think for this very reason :)
16:10:17  <planetmaker> I have an [alias] with glog = -G --template="..." (long template)
16:10:50  <Alberth> I don't understand what to change
16:11:27  <planetmaker> ok, let me see whether I can quickly cook the patch for firs
16:11:47  <Alberth> there is no HGPLAIN
16:13:45  <planetmaker> yes. That's what you would need to add / prepend to each call of hg
16:13:56  <planetmaker> it works like LC_ALL=C command
16:14:13  <planetmaker> tells HG to discard any config in your .hgrc
16:14:22  <planetmaker> when generating its output
16:15:48  <planetmaker> <-- try that, Alberth
16:17:38  <Alberth> seems to work
16:18:28  <planetmaker> if you want, commit it
16:18:33  <planetmaker> it's proper :)
16:18:43  <planetmaker> and I don't want to disturb you patching it
16:20:50  <Alberth> pushed, thanks
16:21:00  <planetmaker> you're welcome :)
16:21:19  <Alberth> I had another question about patch shuffling/splitting
16:21:43  <planetmaker> sure, go right ahead
16:21:51  <Alberth> I had a messy patch, that needed splitting, at line level (hunk level was not good enough)
16:22:02  <Alberth> how can you do that?
16:22:36  <Alberth> after looking around, I resorted to making a new clone and copying changes carefully through gvimdiff between repos
16:23:07  <DevZone> Project make-nml build #64-push: SUCCESS in 28 sec:
16:23:48  <planetmaker> at *line* level? That's tricky and your approach is probably as easy as anything I can offer
16:24:06  <planetmaker> the (c)record extension only works with hunks
16:24:39  <Alberth> ok :)
16:24:50  <DevZone> Project FIRS Industry Replacement Set build #193-push: SUCCESS in 4 min 6 sec:
16:25:03  <Alberth> there is still room for improvement thus :)
16:25:20  <planetmaker> Personally I'd probably get the diff of that changeset, import it and then edit out all stuff which belongs to the 2nd patch and then commit what I think is the first. And then rebase the original commit onto the just created 1st one
16:27:31  <Alberth> where rebase then gets in the way as it fails to understand what you just did :p
16:27:43  <Alberth> I wonder whether git does any better here :)
16:27:56  <planetmaker> no, rebase shouldn't fail
16:28:11  <planetmaker> you might need to solve some merge conflicts, yes.
16:29:12  <Alberth> maybe that's unavoidable
16:30:00  <planetmaker> <-- that's the tree I envision before the rebase (r2 onto r3)
16:30:38  <Alberth> something like that indeed
16:32:11  <planetmaker> but your question actually... OpenTTD findversion should get the HGPLAIN fix, too :)
16:32:30  <Alberth> probably
16:52:08  <DevZone> Project xussrset - Trains from Russia build #540-push: SUCCESS in 4 min 36 sec:
17:16:54  <DevZone> Project OpenGFX+ Landscape build #74-push: SUCCESS in 29 min:
17:18:23  <DevZone> Project FISH is ships build #342-push: SUCCESS in 1 min 27 sec:
17:22:42  <DevZone> Project FIRS Industry Replacement Set build #194-push: SUCCESS in 4 min 18 sec:
17:31:38  <DevZone> Project OpenGFX build #158-push: SUCCESS in 6 min 10 sec:
18:11:44  *** Zuu has quit IRC
18:13:13  *** Zuu has joined #openttdcoop.devzone
18:35:05  *** Supercheese has joined #openttdcoop.devzone
18:40:39  <DevZone> Project road-hog build #470-nightlies: SUCCESS in 38 sec:
19:19:31  <DevZone> Project poltrams build #19-push: SUCCESS in 26 sec:
20:08:34  <DevZone> Project OpenGFX build #159-push: SUCCESS in 10 min:
20:45:15  *** Alberth has left #openttdcoop.devzone
20:56:19  <planetmaker> @base 2 16 00101100
20:56:19  <Webster> planetmaker: 2C
21:15:13  *** erlehmann has joined #openttdcoop.devzone
21:37:57  *** Zuu has quit IRC
22:22:29  *** Sylf has joined #openttdcoop.devzone
22:39:32  *** erlehmann has quit IRC
22:39:35  *** oskari892 has quit IRC
22:44:56  *** gelignite has quit IRC
22:53:45  <DevZone> Project yeti build #102-push: SUCCESS in 6 hr 1 min:
23:31:21  *** LSky` has quit IRC
23:33:07  *** frosch123 has quit IRC

Powered by YARRSTE version: svn-trunk