Log for #openttdcoop.devzone on 9th August 2011:
Times are UTC Toggle Colours
02:34:20  <Brot6> FIRS Industry Replacement Set - Bug #2949 (New): Transport/Airport Terminal - cannot build for Fa... (Jim_B) @
03:18:02  <Brot6> Nutracks - Bug #2882: Metro track set compatibility broken (oberhuemer) @
06:02:00  *** Ammler has quit IRC
06:02:20  *** Ammler has joined #openttdcoop.devzone
06:32:10  <Brot6> NewGRF Meta Language - Revision 1587:a763d2370fe7: Add: Constant for the return value of 'founder... (planetmaker) @
06:39:35  <Brot6> DictatorAI - Revision 131:a2f857cc7d41: - Fix bug when loading game and cannot find INSTANCE ref (krinn) @
06:39:35  <Brot6> DictatorAI - Revision 132:70cb04329ef4: - Remove duplicate jobs from database when the AI has mad... (krinn) @
06:48:28  <Brot6> NewGRF Meta Language - Revision 1588:fba8b4dafc58: Fix: Typo in constant (planetmaker) @
07:03:40  <Brot6> FIRS Industry Replacement Set - Revision 2251:0347f23cf7fc: Fix: Missing ';' in availability temp... (planetmaker) @
07:30:38  <planetmaker> <-- Terkhen; my suggestion how to "finish" the industry code
07:31:01  <planetmaker> The only thing not finished is a bit cleanup of the string properties
07:31:58  <Terkhen> looks nice
07:32:09  <Terkhen> we need a list somewhere of all temp and perm registers that are used
07:32:17  <Terkhen> also, doing messages is going to be a PITA
07:32:24  <planetmaker> permanent registers are declared in defines.pnml
07:32:39  <planetmaker> and should all be declared there
07:32:45  <Terkhen> great :P
07:32:47  <planetmaker> messages?
07:33:01  <planetmaker> you mean number -> string()
07:33:26  <Terkhen> yes
07:33:56  <planetmaker> what I'm not entirely happy with, is that I use sometimes macros, sometimes includes
07:34:04  <planetmaker> but the location code cannot be made with includes
07:34:57  <planetmaker> hm, maybe I first commit this patch queue and leave the messages for another time
07:35:53  <Terkhen> what do you mean with "location code"?
07:36:17  <Terkhen> from what I see, lng files already have "nice" names
07:36:18  <planetmaker> the check wheter an industry can be constructed at a certain place
07:36:24  <Terkhen> ah, I was thinking on translations :P
07:36:34  <planetmaker> no :-)
07:36:45  <planetmaker> I didn't touch them really
07:40:41  <planetmaker> and in order to avoid confusion of commit time, I qfinished each patch separately now ;-)
07:40:55  <Brot6> FIRS Industry Replacement Set - Revision 2252:04e718f27b82: Add: Template to check location for c... (planetmaker) @
07:40:55  <Brot6> FIRS Industry Replacement Set - Revision 2253:c8e47a8546d8: Add: Template to check location for p... (planetmaker) @
07:40:55  <Brot6> FIRS Industry Replacement Set - Revision 2254:ee33300d6cc7: Add: Template for counting months wit... (planetmaker) @
07:40:57  <Brot6> FIRS Industry Replacement Set - Revision 2255:e93b37d14bd0: Add: Template to check for industry c... (planetmaker) @
07:41:01  <Brot6> FIRS Industry Replacement Set - Revision 2256:e8650b49bad1: Codechange: Apply more templates to s... (planetmaker) @
07:41:05  <Brot6> FIRS Industry Replacement Set - Revision 2257:0e663dd5fd04: Cocdchange: Use modern callback style... (planetmaker) @
07:45:02  *** ODM has joined #openttdcoop.devzone
08:02:21  <Brot6> FIRS Industry Replacement Set - Revision 2258:b042805ff85d: Codechange: Apply industry templates ... (planetmaker) @
08:04:30  <Brot6> FIRS Industry Replacement Set - Revision 2259:a846995f38d4: Codechange: Use advanced spritelayout... (Terkhen) @
08:17:21  <Brot6> FIRS Industry Replacement Set - Revision 2260:065d20da4728: Codechange: Apply industry templates ... (planetmaker) @
09:13:56  <Brot6> FIRS Industry Replacement Set - Revision 2261:a261a0301b25: Add: Macro for determining town distance (planetmaker) @
09:18:39  <Brot6> FIRS Industry Replacement Set - Revision 2262:9ed84e64d6e7: Codechange: Apply industry templates ... (planetmaker) @
09:40:51  <Brot6> FIRS Industry Replacement Set - Revision 2263:c2f8be167094: Codechange: Change location check mac... (planetmaker) @
09:59:11  <Brot6> FIRS Industry Replacement Set - Revision 2264:71ae17e60502: Codechange: Apply industry templates ... (planetmaker) @
10:13:43  <Brot6> FIRS Industry Replacement Set - Revision 2265:dc313f6b3f58: Codechange: Apply industry templates ... (planetmaker) @
10:13:43  <Brot6> FIRS Industry Replacement Set - Revision 2266:cdc8fefaca0e: Fix #2938: Steaks are made from cows,... (planetmaker) @
10:13:43  <Brot6> FIRS Industry Replacement Set - Bug #2938 (Closed): Stockyard accepts FMSP instead of LVST (planetmaker) @
10:24:54  <Brot6> FIRS Industry Replacement Set - Revision 2267:a1a80a4b7130: Codechange: Apply industry templates ... (planetmaker) @
10:29:55  <Brot6> FIRS Industry Replacement Set - Revision 2268:ff000ea29fe4: Fix: Remove a few old and wrong comments (planetmaker) @
10:34:38  <Brot6> FIRS Industry Replacement Set - Revision 2269:0621f0e62c44: Change: Rename the extra info string ... (planetmaker) @
10:50:17  <Brot6> FIRS Industry Replacement Set - Revision 2270:40e6283f9671: Codechange: Apply industry templates ... (planetmaker) @
10:56:47  <Brot6> Nutracks - Bug #2882: Metro track set compatibility broken (foobar) @
11:08:00  <Hirundo> Terkhen: Do toyland flatbed trucks use the same gfx for all generations?
11:08:36  <Terkhen> yes, all toyland trucks have no sprites for different generations, both in opengfx and in opengfx+ industries
11:11:25  <Hirundo> OK *removes toyland support from the ogfx-rv based example RV grf*
11:18:31  <Hirundo> Not that I don't like toyland, but 5 cargo-specific gfx are enough to make the point clear :)
11:32:33  <planetmaker> coding examples, Hirundo?
11:33:25  <planetmaker> hm... the FIRS hotel IMHO needs a rework.
11:33:34  <planetmaker> it looks like slums to me, not like a hotel :-P
11:34:34  <Hirundo> planetmaker: yes, a RV this time
11:35:05  <Hirundo> ogfx-rv is perfect as it does cargo-specific gfx and refitting (and just that), which is exactly what the train example lacks :)
11:35:25  <planetmaker> :-)
11:35:29  <Hirundo> Terkhen: Am I correct in thinking that with default settings, ogfx-rv leaves base costs at 0 ?
11:35:35  <planetmaker> yes
11:35:54  <planetmaker> mv planetmaker Terkhen-fake
11:35:59  <planetmaker> :-P
11:37:15  <Hirundo> :p
11:39:41  <Brot6> OpenGFX+ Landscape - Feature #2950 (New): Improve auto-fences (planetmaker) @
11:48:36  <planetmaker> Hirundo: what does NML do if I query in a switch like "number * 1.35" ?
11:49:30  <planetmaker> or what I look at in detail:
11:50:04  <planetmaker> ((industry_count(11) * 5) / 4) / industry_clusters vs. ((industry_count(11) * 1.25) / industry_clusters
11:50:35  <Hirundo> did you try?
11:51:53  <planetmaker> no :-P
11:51:53  <Terkhen> sorry, I will be afk most of the time today, big family reunion :P
11:52:01  <planetmaker> enjoy, Terkhen
11:52:02  * Terkhen happily delegates further questions on planetmaker 
11:52:37  <Terkhen> bbl ;)
11:52:44  <Hirundo> enjoy :P
11:55:49  <Brot6> FIRS Industry Replacement Set - Revision 2271:cbfa8dab95b4: Codechange: Apply industry templates ... (planetmaker) @
11:55:49  <Brot6> FIRS Industry Replacement Set - Revision 2272:7fa0b67a2c6f: Fix: Copy random cargo output switche... (planetmaker) @
11:58:55  * Hirundo is quite baffled by FIRS r2272
11:59:03  <planetmaker> :-)
11:59:19  * planetmaker somewhat as well.
11:59:44  <planetmaker> But I'm not yet sure exactly what the aim of that code is
11:59:55  <planetmaker> it looks a bit murky and I need andy for that end
12:00:05  <planetmaker> random cargo output sounds fishy to me
12:00:48  <Brot6> NewGRF Meta Language - Revision 1589:a5fe63dfe13a: Add: Road vehicle example. (Hirundo) @
12:00:53  <Hirundo> it sets a random output cargo type
12:00:58  <planetmaker> and given the two industries are very different, I'm the more suprised they share a random cargo output switch
12:01:09  <planetmaker> yes, it does
12:01:28  <planetmaker> I know what it does. But I don't yet know the intention
12:01:37  <Hirundo> so the return values should be cargo types
12:01:45  <planetmaker> they are
12:01:52  <Hirundo> but I have no clue how 2327 would be a cargo type
12:01:58  <planetmaker> though still numeric...
12:02:12  <planetmaker> see, one of the things why I better not template it now :-)
12:02:15  <Hirundo> If your cargo table is that long, you have other troubles :)
12:02:21  <planetmaker> :-D
12:02:55  <planetmaker> that whole concept of random cargo output is surprising for me. I didn't expect to find it in FIRS
12:03:29  <planetmaker> and r2272 was needed as I accidentially destroyed the sharing when I templated one industry and renamed switches
12:03:50  <planetmaker> and arbitrarily pointing to another_industrycargo_output switch sounded even worse to me
12:04:27  <Hirundo> <- a quick search revealed this one, looking further now
12:06:16  <planetmaker> hm... I never noticed ingame :-)
12:06:26  <planetmaker> And I wonder how the industry chain view handles it :-)
12:06:30  <Hirundo> me neither
12:06:33  <Hirundo> It doesn't
12:07:25  *** ODM has quit IRC
12:09:24  <Hirundo> It might very well have been an error
12:10:39  <planetmaker> more important is the cluster code... which could use the above change, if NML does the right thing with such float numbers ;-)
12:10:43  <planetmaker> I guess it does
12:11:10  <Hirundo> Does it? I'd be surprised as nfo doesn't do float maths
12:11:27  <planetmaker> we can also have float properties
12:11:35  <Hirundo> that's handled by NML entirely
12:12:46  <planetmaker> hm, indeed. The complexity to do one or the other are grossly different
12:34:24  <planetmaker> temporary storage 256+x are string parameters, right?
12:34:45  <Hirundo> yes, for CBs that support them
12:34:59  <planetmaker> thanks :-)
12:35:27  <Hirundo> parametrized strings are (still) on the todo list
13:19:46  *** FooBar has joined #openttdcoop.devzone
13:20:01  <Brot6> OpenGFX - Bug #2153: tubular brigde (foobar) @
13:26:05  <Brot6> OpenGFX - Bug #2153: tubular brigde (planetmaker) @
13:26:48  <Brot6> OpenGFX - Bug #2153: tubular brigde (planetmaker) @
13:27:48  <planetmaker> <-- you have been very productive, FooBar :-)
13:28:13  <FooBar> I know :)
13:28:20  <planetmaker> :-P
13:28:32  <FooBar> I also now see that the bridge idea fails... In the bridge itself :P
13:28:53  <Ammler> planetmaker: be sure to get ride of credits in the changelog
13:29:16  <FooBar> The ballast appears to be using the dark brown, which now gets translated to grey as well
13:29:23  <planetmaker> that's nowhere near being committed, Ammler  :-)
13:29:32  <planetmaker> and yes, for changelog.txt final it will
13:29:36  <Hirundo> Are there any airport grfs out there, besides the obvious airportsplus?
13:29:48  <planetmaker> not that I know
13:29:53  <FooBar> I liked the idea of an easy fix, but if it breaks itself it's not a good fix
13:30:06  <planetmaker> there are very outdated newgrfs by y exo which work in the airports branch
13:30:28  <planetmaker> FooBar, changing recolour table is not easy as it means to test all newgrfs
13:30:36  <Hirundo> Are airport rotations done in AP+ ?
13:30:42  <FooBar> Ask Pikka. He might be secretly working on something which you can borrow for testing purposes
13:31:05  <planetmaker> Hirundo, the small airport has two views, normal and 180°
13:31:21  <FooBar> planetmaker: yes, that's why I didn't apply it straight away, but posted to the issue first
13:31:35  <Hirundo> planetmaker: ah, that'll do just fine (AP example of course)
13:31:43  <planetmaker> :-)
13:31:58  <planetmaker> mv Hirundo Docundo :-P
13:32:08  <planetmaker> hm... that's not a good rename ;-)
13:32:12  <planetmaker> doc-undo :-P
13:32:16  <FooBar> :D
13:32:31  <planetmaker> Hirundoc
13:32:39  <Hirundo> :p
13:32:56  <planetmaker> sorry, I'm silly, but I enjoy it :-P
13:32:56  <Hirundo> Only do that on your local working copy of me, please
13:33:00  <Hirundo> ;)
13:33:24  <planetmaker> :-)
13:33:53  <Hirundo> APT_CB_ANIM_NEXT_FRAME: return 0xFE; // Let OpenTTD handle the animation <- Then what's the point of implementing that CB?
13:35:01  <planetmaker> having animation at all?
13:35:17  <planetmaker> it means always use next frame on CB
13:35:26  <planetmaker> not selecting a frame manually
13:36:19  <planetmaker> there's a nicer constant for 0xFE, though
13:36:23  <Hirundo> next frame is the default
13:36:33  <Hirundo> If you do no callback, it'll select the next frame also
13:36:50  <planetmaker> ?
13:37:05  <planetmaker> you have to activate animation explicitly, or it won't happen
13:37:15  <Hirundo> enabling animation just requires setting animation_info (which, btw, still requires a nice way to disable animation)
13:37:38  <Hirundo> in fact, the next frame CB won't even be called unless animation is enabled that way
13:38:19  <planetmaker> well... I always assume(d) that if I want animation I have to somehow choose a frame
13:38:37  <planetmaker> there's more elaborate animation in ogfx+industries
13:38:47  <planetmaker> as such you could skip animation in this example
13:39:06  <planetmaker> the oilwell really make use of non-continuous animation
13:41:14  <Hirundo> Thanks for the tip
13:41:17  <Hirundo> So I guess, animation needs some more documentation ...
13:41:28  *** Hirundo is now known as Hirundoc
13:41:36  *** Hirundoc is now known as Hirundo
13:44:31  <planetmaker> :-)
13:44:34  <planetmaker> you're welcome
13:47:23  <planetmaker> Hirundo, and that even happens when one uses both documentation, the NML and the newgrf wiki (and sometimes also the NML source) in parallel ;-)
13:47:44  <planetmaker> btw, Hirundo, what do you think of the idea to add information on the value of the individual constants NML defines
13:48:22  <planetmaker> In the process of converting FIRS to readable code I somehow always need to have NML source files open for reference on the values I see there. Alternatively the newgrf wiki itself is needed
13:48:35  <planetmaker> but I'm somewhat undecided...
13:49:29  <Hirundo> I'm not a fan of exposing unneeded info to the user
13:49:42  <Hirundo> Everything that's not documented can be changed w/o notice, I like that :)
13:50:56  <planetmaker> yes, I know... that's the power of it
13:54:37  <Hirundo> tbh, I'm kinda hesitant to add such info to the documentation for this one use-case
13:56:11  *** Lakie has joined #openttdcoop.devzone
14:04:30  <planetmaker> I'm not sure it's a one-time use case. Though a grf2nml script possibly could be taught the proper constants
14:04:53  <planetmaker> and yes, I honestly hope that y exo will incorporate that at a future date
14:05:08  <planetmaker> it has definitely more use cases than just firs ;-)
14:05:20  * planetmaker thinks of ttrs as an example ;-)
14:10:30  <Brot6> FIRS Industry Replacement Set - Revision 2273:12a8044bbe61: Cleanup: Describe use of persistant v... (planetmaker) @
14:11:41  <Brot6> FIRS Industry Replacement Set - Revision 2274:108b1797f95c: Fix (r2273): Typo in comments (planetmaker) @
14:26:49  <Hirundo> grf2nml'ing houses will present about a dozen more cans of worms
14:31:31  <planetmaker> houses have some worm cans even without reverse-engineering a grf ;-)
14:31:51  <Hirundo> ^exactl
14:32:32  <planetmaker> but then... I'm somewhat confident it will be possible *somewhen*
14:36:51  <Brot6> Central European Train Set - Feature #2763: track classes / railtype support (oberhuemer) @
14:38:36  <Brot6> Central European Train Set - Feature #2763: track classes / railtype support (oberhuemer) @
14:39:44  <Brot6> Central European Train Set - Feature #2763: track classes / railtype support (oberhuemer) @
14:48:11  <Brot6> Central European Train Set - Feature #2763: track classes / railtype support (Eddi) @
15:08:59  *** frosch123 has joined #openttdcoop.devzone
15:31:31  <Brot6> FIRS Industry Replacement Set - Revision 2275:94d950473464: Fix: Terminating a comment twice is n... (planetmaker) @
15:31:31  <Brot6> FIRS Industry Replacement Set - Revision 2276:c07bb1c7bd6a: Change: The closure counter is now re... (planetmaker) @
15:31:31  <Brot6> FIRS Industry Replacement Set - Revision 2277:93d1ec99b174: Add: Template for extra text for blac... (planetmaker) @
15:31:34  <Brot6> FIRS Industry Replacement Set - Revision 2278:1b99e1d7ecab: Add: Template for 'production' for bl... (planetmaker) @
15:40:22  <Brot6> FIRS Industry Replacement Set - Revision 2279:66a6800de600: Change: Apply industry templates to p... (planetmaker) @
15:52:31  <Brot6> FIRS Industry Replacement Set - Revision 2280:13764c92ac85: Codechange: Apply the secondary indus... (planetmaker) @
15:59:47  <Brot6> FIRS Industry Replacement Set - Revision 2281:823dd11762fb: Codechange: Apply the blackhole indus... (planetmaker) @
16:08:21  <Brot6> FIRS Industry Replacement Set - Revision 2282:26ea0cd49138: Codechange: Apply the secondary indus... (planetmaker) @
16:27:57  *** FooBar has quit IRC
16:52:16  <Brot6> FIRS Industry Replacement Set - Revision 2283:22709e15540f: Add: Macro to allow checking for a ne... (planetmaker) @
16:52:16  <Brot6> FIRS Industry Replacement Set - Revision 2284:420b72ef4955: Codechange: Apply secondary industry ... (planetmaker) @
16:55:04  <Ammler> planetmaker: little patch for you changelog: <-- nml2nfo is not working yet
16:56:02  <Ammler> (Makefile change is just internal)
16:57:16  <Brot6> Central European Train Set - Feature #2763: track classes / railtype support (oberhuemer) @
16:58:27  <planetmaker> :-)
16:59:59  <Brot6> Central European Train Set - Feature #2763: track classes / railtype support (oberhuemer) @
17:11:09  <Brot6> nml: update from r1585 to r1589 done -
17:20:04  <Brot6> firs: update from r2247 to r2284 done (37 warnings) -
17:20:09  <Brot6> FIRS Industry Replacement Set - Revision 2285:aa8fd7291def: Fix: Location check for town distance... (planetmaker) @
17:21:47  <Brot6> nutracks: update from r202 to r203 done (1 warnings) -
17:23:10  <Brot6> Following repos didn't need a nightlies update: ogfx-trains (r248), narvs (r37), bros (r52), ogfx-industries (r122), opengfx (r721), ailib-tile (r16), foobarstramtracks (r23), transrapidtrackset (r28), 2cctrainset (r750), cets (r126), ailib-list (r32), opensfx (r97), ttdviewer (r34), worldairlinersset (r672), heqs (r638), openmsx (r97), basecosts (r25), nml (r1589), 32bpp-extra (r40), manindu (r7), newgrf_makefile (r305),
17:23:10  <Brot6> ailib-direction (r17), ailib-common (r21), snowlinemod (r49), dutchtramset (r87), ai-admiralai (r75), swisstowns (r22), metrotrackset (r56), spanishtowns (r10), frenchtowns (r6), grfpack (r279), ogfx-rv (r107), fish (r684), ogfx-landscape (r76), ttrs (r36), ogfx-trees (r51), swedishrails (r205), grfcodec (r833), ai-aroai (r39), german-townnames (r34), smts (r19), chips (r143), belarusiantowns (r8), indonesiantowns (r41), ailib-string
17:23:12  <Brot6> (r29), airportsplus (r107), comic-houses (r71)
17:24:15  <Brot6> FIRS Industry Replacement Set - Revision 2286:e594bef4b196: Add: Use blackhole industry templates... (planetmaker) @
17:24:39  <Brot6> narvs: compile of r37 still failed (#2789) -
17:45:12  <Brot6> Following repos rebuilds successful without any difference to earlier nightlies builds: ogfx-trains (Diffsize: 281), ogfx-industries (Diffsize: 120), foobarstramtracks, cets (436 warnings) (Diffsize: 462), manindu (Diffsize: 2), newgrf_makefile, dutchtramset, swisstowns, spanishtowns (Diffsize: 2), frenchtowns, ogfx-rv (Diffsize: 4775), ogfx-landscape (2 warnings), swedishrails, german-townnames (Diffsize: 1), belarusiantowns (Diffsize:
17:45:12  <Brot6> 30), indonesiantowns (1 warnings) (Diffsize: 1), airportsplus (2 warnings) (Diffsize: 30186)
18:15:00  *** ODM has joined #openttdcoop.devzone
18:23:47  *** andythenorth has joined #openttdcoop.devzone
19:06:31  <Brot6> clientpatches: update from r22730 to r22731 done (6 warnings) -
19:11:34  <Brot6> openttd-vehiclevars: update from r22730 to r22731 done -
19:16:37  <Brot6> serverpatches: update from r22730 to r22731 done (10 warnings) -
19:18:54  <Brot6> 32bpp-ez-patches: compile of r22731 still failed (#2446) -
19:44:39  <Brot6> Grf2Html - Revision 233: Fix: Crash when encountering VarAction2 with variables of unknown (relat... (frosch) @
19:47:45  <Terkhen> hi
19:49:02  <andythenorth> hola
19:49:36  <andythenorth> ok
19:49:53  <andythenorth> so now I have a repeat of the crossed branch situation that was very bad last time I had it for FIRS
19:49:57  <andythenorth> wtf do I do?
19:50:29  * Terkhen does not understand the situation
19:50:40  <andythenorth> so events:
19:51:07  <andythenorth> 1. I committed a fix to stockyard 2 days ago, but couldn't push due to server issue
19:51:10  <andythenorth> 2. I pulled today
19:51:15  <andythenorth> 3. I have crossed branches
19:51:21  <andythenorth> 4. I can't hg up
19:51:35  <andythenorth> 5. last time I tried to resolve this with merges, I lost my repo and outstanding changes
19:51:39  <Terkhen> hmm... IIRC you have to rebase
19:51:42  <andythenorth> and nobody could figure out why
19:51:52  <Terkhen> but I never had that issue, and neither have I used rebase
19:52:22  <andythenorth> planetmaker: any ideas? (sorry to bother)
19:52:24  * Terkhen would do: "hg diff -r before_your_change -r your_change > file.diff"
19:52:33  <Terkhen> get a clean repo and commit again :P
19:52:55  <andythenorth> that's tempting
19:52:58  <andythenorth> but can't be correct
19:53:29  <andythenorth> there must be a solution, or distributed vcs concept is flawed
19:54:41  <Terkhen> I agree, there must be a correct solution
19:55:05  <Terkhen>
19:55:06  <Webster> Title: RebaseProject - Mercurial (at
19:55:18  <Terkhen> hmm... that link seems quite old
19:55:33  <Terkhen>
19:55:34  <Webster> Title: RebaseExtension - Mercurial (at
19:55:46  <Terkhen> looks like what you need
19:55:47  <andythenorth> Ammler: there was a useful way to show hg branches?
19:55:59  <andythenorth> you had a shell command that made nice output?
19:56:48  <Hirundo> solution to 4. would be 'hg up -C', though that will discard any uncommitted changes (save them into a patch beforehand)
19:58:48  <andythenorth> Hirundo: worked
19:58:49  <andythenorth> thanks
19:59:19  <Ammler> [alias]
19:59:21  <Ammler> slog = glog -l10 --template "{branch}\t{rev}:{node|short}|{author|person} {desc|firstline}\n"
19:59:39  <Terkhen> nice, noted :P
20:01:00  <Ammler> andythenorth: hg up <to your split>
20:01:16  <Ammler> andythenorth: hg rebase -d tip
20:02:03  <Ammler> or hg rebase -s <your unpushed rev> -d tip
20:02:22  <Ammler> maybe you don't need -d
20:02:39  <andythenorth> I've binned my changes
20:02:46  <Ammler> :-(
20:02:48  <andythenorth> I don't trust anything else any more
20:02:59  <Ammler> then merge
20:03:01  <Brot6> FIRS Industry Replacement Set - Bug #2938 (Reopened): Stockyard accepts FMSP instead of LVST (andythenorth) @
20:03:02  <andythenorth> trying to do anything sophisticated results in broken repo every time
20:03:09  <andythenorth> merge refused
20:03:14  <Ammler> ok
20:03:27  <Ammler> well, if merge doesn't work, rebase wouldn't either
20:03:32  <andythenorth> in this case it's only 2 LOC of to change
20:03:39  <andythenorth> could have been much worse
20:04:40  <andythenorth> in this situation, the safest thing seems to be to save to patch, then bin all local changes.
20:04:47  <andythenorth> then up to tip
20:07:28  <Ammler> for you maybe :-)
20:07:36  <Ammler> but not what pros do
20:08:06  *** frosch123 has quit IRC
20:08:31  <Ammler> the big advantage of hg to svn is that you can so easy merge
20:16:32  <planetmaker> hello
20:16:50  <planetmaker> andythenorth: the "correct" solution IMHO is to use a mercurial queue
20:17:08  <planetmaker> and qpop it before you want to commit. and the qpush and qfinish each separately
20:17:42  <planetmaker> works for me wonders when I do a bit larger things. If I have a change, I just hg qnew -m "commit message" filename.diff
20:17:51  <planetmaker> and voila, a changeset which I can easily juggle around
20:18:01  <planetmaker> and a changeset which is not permanent
20:19:31  <Terkhen> that might not be useful for a single two line patch :P
20:19:34  <planetmaker> and they're changsets which I can even ammend
20:19:39  <planetmaker> Terkhen: why not?
20:19:43  <planetmaker> easier than rebase or so
20:19:59  <planetmaker> if it's only one patch - yes
20:20:10  <planetmaker> then not. But... with one patch one doesn't need to rebase or so...
20:20:32  <planetmaker> one might need to manually fix some merging during hg up
20:20:49  <Terkhen> a single two line patch
20:21:04  <Terkhen> he did not commited it because of connection problems
20:21:22  <planetmaker> well, yes :-) but then "not commit" is fine
20:21:47  <Terkhen> you can't know that until you push :P
20:21:58  <planetmaker> if they're completely separate like a template and an industry... I just keep it uncommited
20:22:09  <planetmaker> Terkhen: yes, that's the point: I don't commit unless I can pull
20:22:15  <planetmaker> if I can't pull I use mq
20:22:19  <Terkhen> oh, ok :P
20:22:42  <planetmaker> with mq it looks the same but is much easier rebased
20:30:32  <Ammler> that is like using export and import
20:31:25  <Ammler> you think "hg rebase -s <rev>" is complicated?
20:31:36  <Ammler> or -d or whatever
20:31:39  <planetmaker> no :-)
20:31:59  <planetmaker> but a merge then needs a separate commit
20:32:06  <planetmaker> should changes be required
20:32:15  <planetmaker> mq allows to change the single changesets
20:32:20  <Ammler> he?
20:32:40  <Terkhen> that's what I usually do, hg qpop -a && hg pull -u && hg qpush -a
20:32:43  <planetmaker> consider incompatible changes
20:32:51  <planetmaker> Terkhen: yes, that's what I do, too
20:33:13  <Ammler> Terkhen: I don't see, how that is related to a rreabase :-)
20:33:37  <Terkhen> it's related to not needing rebases
20:33:40  <planetmaker> ^
20:33:41  <Ammler> rebase is basically export - strip - import
20:34:16  <Ammler> well, your forgot qfinish
20:34:20  <planetmaker> yes. But why mess with the permanent history of a repo when I don't need it :-)
20:34:33  <Ammler> but the point is, with rebase you do that in one step
20:34:41  * Terkhen does not use qfinish either
20:34:48  * planetmaker does :-)
20:35:02  <planetmaker> Terkhen: it makes commit easy... when you choose a proper commit message right away
20:35:12  <planetmaker> or with a qrefresh
20:35:13  <Terkhen> I prefer to supervise the patches again one by one and choose the commit message at the end
20:35:19  <Ammler> planetmaker: only if you use -D for your commits :-P
20:35:27  <Ammler> refresh*
20:35:31  <planetmaker> Terkhen: that's still possible :-)
20:35:48  <planetmaker> qfinish can work by the single patch
20:36:17  <planetmaker> what I did today was qpop -a; qpush; qfinish; qpush; qfinish.
20:36:26  <planetmaker> Add the review / check where needed
20:37:15  <planetmaker> Terkhen: it's just a convenient way to not qpop -a. and the patch -p1 < .hg/patches/name.diff
20:37:26  <planetmaker> qdiff gives you the single diff after all, too
20:37:53  <Terkhen> I tend to mess up with commits, I prefer the long path that forces me to review everything
20:38:50  <planetmaker> I don't see the difference really
20:38:52  <Brot6> FIRS Industry Replacement Set - Bug #2944 (Rejected): Livestock is not accepted by any industry (andythenorth) @
20:39:07  <planetmaker> how do you commit a patch queue here in a devzone repo?
20:39:23  <Terkhen> using a different, clean repo
20:39:25  <Terkhen> patching in order
20:39:29  <Terkhen> reviewing each patch
20:39:36  <Terkhen> choose a commit message
20:39:37  <Terkhen> repeat
20:39:47  <Terkhen> as I said, long and stupid, but it forces me to review everything
20:40:04  <Brot6> FIRS Industry Replacement Set - Bug #2944 (Rejected): Livestock is not accepted by any industry (andythenorth) @
20:40:04  <Brot6> FIRS Industry Replacement Set - Bug #2949 (Rejected): Transport/Airport Terminal - cannot build f... (andythenorth) @
21:06:36  *** andythenorth has quit IRC
21:08:07  <Brot6> Dutch Train Set - Feature #2951 (New): Livery options (foobar) @
21:21:23  *** Lakie has quit IRC
21:29:14  *** ODM has quit IRC
22:09:40  <Brot6> FIRS Industry Replacement Set - Revision 2287:cc9bc73a2da5: Codechange: Apply secondary industry ... (planetmaker) @
22:21:10  <Brot6> FIRS Industry Replacement Set - Revision 2288:dee0f1f70653: Codechange: Apply secondary industry ... (planetmaker) @
22:52:13  <Brot6> FIRS Industry Replacement Set - Revision 2289:87f7e82ed021: Codechange: Apply secondary industry ... (planetmaker) @
23:00:39  *** Ammler has quit IRC
23:01:31  *** Webster has joined #openttdcoop.devzone
23:01:36  *** Ammler has joined #openttdcoop.devzone
23:10:33  <Brot6> FIRS Industry Replacement Set - Revision 2290:1fbcb43591c0: Codechange: Apply secondary industry ... (planetmaker) @
23:15:58  <Brot6> FIRS Industry Replacement Set - Revision 2291:e73099b24719: Change: Add default values for the ex... (planetmaker) @
23:28:06  <Hirundo> <- :o
23:31:01  <Hirundo> cd firs && hg commit -m "Add: New industry "planetmaker". Accepts: FOOD, BEER Produces: Templated industry code" && hg push
23:31:31  <Hirundo> You did a pretty awesome job today  :P
23:34:04  <Hirundo> goodnight

Powered by YARRSTE version: svn-trunk