Log for #openttdcoop.devzone on 13th June 2009:
Times are UTC Toggle Colours
01:33:20  <Brot6> Backup done! (Usage: 55M)
01:33:20  <Brot6> I request a weekend in Havana with Phil Silvers!
05:37:42  <Brot6> ::DevZone:: Heavy Equipment Set - @ (by andythenorth)
05:51:59  *** andythenorth has quit IRC
06:02:59  *** andythenorth has joined #openttdcoop.devzone
06:27:30  *** andythenorth has quit IRC
06:40:19  *** andythenorth has joined #openttdcoop.devzone
08:12:13  <Ammler> andythenorth: around 10 posts in your thread just about your version name :-D
08:12:24  <andythenorth> bleargh
08:13:53  <andythenorth> The default length of articulated RVs turns out to *suck*
08:16:36  <andythenorth> or it's my drawing
08:16:43  <andythenorth> probably my drawing
09:23:22  *** Brot6 is now known as Brot
09:30:24  *** Brot is now known as Brot1
09:39:06  *** Brot1 is now known as Brot6
10:12:15  <Brot6> ::DevZone:: Client Patch Pack - Revision 717: Cleanup: (svn r16555) -Feature [FS#570]: ability to enter serve... @ (by Ammler)
10:12:15  <Brot6> ::DevZone:: OTTDBash - Revision 717: Cleanup: (svn r16555) -Feature [FS#570]: ability to enter server and com... @ (by Ammler)
10:24:00  <Brot6> ::DevZone:: World Airliners Set - Revision 25: Added 4 Sets of Cargo IDs and Sprite Co-ords A320-200 @ (by Beardie27)
10:36:03  *** HirundoAl is now known as Hirundo
10:38:41  <Brot6> ::DevZone:: World Airliners Set - Revision 17: Updated Coding Table with A320-100/-200 Info @ (by Beardie27)
10:38:41  <Brot6> ::DevZone:: World Airliners Set - Revision 18: A320-200 NFO Plane Data Added @ (by Beardie27)
10:51:58  <Brot6> ::DevZone:: Infrastructure Sharing - Feature #185: Allow configuring which locks (and/or boat bridges) to share @ (by Hirundo)
11:55:12  *** Beardie has joined #openttdcoop.devzone
11:55:16  <Brot6> ::DevZone:: World Airliners Set - Revision 26: Added Extra Coded Column to ATR @ (by Beardie27)
11:55:18  <Beardie> Hello?
11:55:36  <Beardie> Anyone?
11:56:12  <Ammler> Hello Beardie: don't do that, you should see a list of users somewhere on your client
11:56:44  <Ammler> if the guy is there, you are looking for, just talk
11:57:22  <Ammler> he might be not online but reading it later, a simple "Anyone?" doesn't help ;-)
11:58:05  <andythenorth> Beardie: just post the question, see if you get an answer
11:58:08  <andythenorth> ;)
11:58:08  <Ammler> "Hello" is always nice :-)
11:59:12  <Brot6> ::DevZone:: World Airliners Set - Feature #181: A320-200 NFO @ (by Beardie27)
11:59:12  <Brot6> ::DevZone:: World Airliners Set - Feature #181 (Resolved): A320-200 NFO @ (by Beardie27)
11:59:12  <Brot6> ::DevZone:: World Airliners Set - Feature #181 (Closed): A320-200 NFO @ (by Beardie27)
11:59:17  <Beardie> ok sorry
11:59:22  <Beardie> didn;t think anyone was here
11:59:50  <Ammler> you don't need to talk, if you listen :-)
11:59:53  <Beardie> doesn't matter now anyway
12:04:50  <Ammler> :-(
12:09:14  <Beardie> sorry
12:09:24  <Ammler> :-)
12:09:52  <Beardie> i was just looking at how to set a issue done
12:10:13  <Beardie> and whats the reason behind the green ticks and the apply? in the issues page
12:10:18  <Brot6> ::DevZone:: World Airliners Set - Revision 27: Final Revision of A320-200 Nfo @ (by Beardie27)
12:10:23  <Ammler> Beardie: if you reference the ticket in the commit message, ti would close automatically
12:10:52  <Beardie> o so a issue can be resloved or clased via a commit?
12:11:03  <Ammler> like "Feature #181: A320-200 added to
12:11:27  <Ammler> that would set it to resolve
12:11:43  <Ammler> if you add the word close or fix or bug, it would close it
12:12:01  <Beardie> so what would i actually type in cmd
12:12:01  <Ammler> you should always mention the ticket on the commit message
12:12:22  <Ammler> so you can easy switch between
12:13:17  <Ammler> check firs commits or the openttd truk
12:13:55  <Ammler> and finally, you can close them by hand, then you should mention the revision: rXX
12:14:36  <Ammler> if you like feedback or whatever, you set the ticket to resolved.
12:15:07  <Beardie> ok
12:16:48  <Beardie> on a issue how do you add category?
12:16:58  <Ammler> settings
12:17:13  <Ammler> you are the manager, you need to do that :-)
12:17:18  <Beardie> ok
12:17:29  <Beardie> Issue Categorys :)
12:17:42  <Ammler> you should set djn as dev, btw
12:17:49  <Ammler> as he commits
12:18:02  <Beardie> i mentioned that to him he didn't really give me a answer
12:18:10  <Beardie> but i will do it anyway
12:18:20  <Ammler> if I will ever introduce some restrictions
12:18:30  <Ammler> you need to be dev to commit
12:19:10  <Ammler> edithor is someone who can edit the wiki
12:19:17  <Beardie> ok
12:19:20  <Ammler> and watcher can only read
12:19:22  <Beardie> whats the wiki for?
12:19:36  <Ammler> dunno, guide?
12:19:37  <Beardie> for info on the set?
12:19:40  <Beardie> yeah
12:19:42  <Ammler> specs or whatever
12:19:56  <Ammler> you can disable the modules you don't need
12:20:01  <Ammler> also on your settings panel
12:20:28  <Ammler> maybe you like to move the forum :-)
12:20:59  <Ammler> just think about, content, which needs edit, should go to wiki
12:21:27  <Beardie> move the graphics forum hummmm
12:21:40  <Beardie> i don;t host it
12:21:41  <Ammler> that is the big downside on the forums, only the creator or admins can edit those later.
12:21:58  <Beardie> edit the graphics?
12:22:01  <Ammler> well, not the software :-)
12:22:01  <Beardie> enyone can
12:22:15  <Ammler> just the content of the forum
12:22:31  <Beardie> o
12:22:34  <Beardie> true
12:22:56  <Ammler> the images threads could become tickets, if they aren't already.
12:23:30  <Beardie> i am all confused
12:23:48  <Ammler> nvm, take it easy. :-)
12:23:52  <Beardie> ok
12:23:57  <Beardie> what do you mean by tickets
12:24:00  <Beardie> issues?
12:24:02  <Ammler> just suggestions, nothing to really worry about.
12:24:13  <Ammler> yep.
12:24:20  <Beardie> ok
12:24:21  <Beardie> lol
12:26:55  <Beardie> watch teh difference between resloved and closed
12:57:06  <Ammler> Beardie: you can close directly ;-)
13:25:10  <Brot6> ::DevZone:: World Airliners Set - Revision 28: Updated A320-200 NFo Co-ord Error + A320 Co-ord File @ (by Beardie27)
13:28:29  <Ammler> Beardie: no ticket related?
13:32:16  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 50: Change: removed drawbars from No. 8 and No. 9 Bulldozers - req... @ (by andythenorth)
13:34:53  <Brot6> ::DevZone:: World Airliners Set - Revision 29: Updated 7F_english file with more Airliners @ (by Beardie27)
13:38:34  <Brot6> ::DevZone:: World Airliners Set - Revision 30: Corrected Cargo Text ID Error A320-200 Nfo @ (by Beardie27)
13:46:15  <Beardie> Ammler i don't get it
13:46:20  <Beardie> thats why lol
13:49:38  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 51: Change: large drawbar length reduced, now uses invisble graphics @ (by andythenorth)
13:54:02  <Brot6> ::DevZone:: World Airliners Set - Bug #187: Fix A320-200 Spanair flashing winglets @ (by Beardie27)
14:01:15  *** andythenorth has quit IRC
14:08:38  *** andythenorth has joined #openttdcoop.devzone
14:16:53  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 52: Change: large_bulldozer_trailer.pcx renamed to large_float_tra... @ (by andythenorth)
14:33:13  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 53: Change: improved wheels for very large belly dump trailer @ (by andythenorth)
14:55:43  <Brot6> ::DevZone:: World Airliners Set - Feature #188: Add Landing and take off Speeds to existing aircraft @ (by Beardie27)
14:55:43  <Brot6> ::DevZone:: 2cc train set - Bug #189: DLR Runningcost @ (by DJNekkid)
15:01:23  <Ammler> Beardie: you don't get what?
15:05:11  <Brot6> ::DevZone:: Infrastructure Sharing - Feature #185: Allow configuring which locks (and/or boat bridges) to share @ (by Ammler)
15:08:54  <andythenorth> Ammler: abort: data/psds/.DS_Store.i@e959df7694ce: no match found!
15:09:02  <andythenorth> output from hg status...
15:09:30  <andythenorth> ??
15:10:56  <andythenorth> hmm can't commit either :(
15:11:04  <Ammler> hg revert .
15:11:15  <Ammler> but backup your work before
15:11:27  <Ammler> the changes I mean
15:12:09  <andythenorth> pdq2s-macbook-3:heqs_build andy$ hg revert .
15:12:09  <andythenorth> abort: data/psds/.DS_Store.i@e959df7694ce: no match found!
15:12:10  <andythenorth> pdq2s-macbook-3:heqs_build andy$ hg revert --all
15:12:10  <andythenorth> abort: data/psds/.DS_Store.i@e959df7694ce: no match found!
15:12:19  <andythenorth> bloody mac thing probably
15:12:44  <Ammler> delete that thing manually?
15:12:59  <Ammler> and add it to the local ignore list
15:13:19  <Ammler> you don't need to revert then.
15:18:03  <andythenorth> hmm that hasn't worked.
15:18:11  <andythenorth> wonder if my repo's fucked :0
15:18:53  <Ammler> well, you could make a diff
15:19:12  <Ammler> and then patch it to an other backup clone
15:19:31  <Brot6> ::DevZone:: World Airliners Set - Revision 31: Added Coded Column to Airbus Trackting Table @ (by Beardie27)
15:19:35  <Ammler> which project do you talk about?
15:20:06  <andythenorth> heqs
15:20:14  <andythenorth> hg verify
15:20:15  <andythenorth> 22 integrity errors encountered!
15:20:38  <andythenorth> all .DS_Store files
15:23:45  <Ammler> I delete them all and commit a fix, ok?
15:24:15  <andythenorth> ok, looking at Google,  I'm not the first to have this problem
15:26:30  <Ammler> do you have the DS files in your local ignroe list now?
15:26:43  <Ammler> also DS_Store* ?
15:27:41  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 54: Cleanup: some OSX specific files, unneded in the repo @ (by Ammler)
15:32:19  <andythenorth> hgignore has:
15:32:19  <andythenorth> ./*.DS_Store
15:32:19  <andythenorth> ./*.DS_Store*
15:32:45  <Ammler> can pull my change
15:32:57  <Ammler> and then verify again
15:34:31  <andythenorth> still 22 integrity errors :(
15:34:35  <andythenorth> might clone again
15:35:23  <Ammler> why does hg st output?
15:35:27  <Ammler> what*
15:41:41  <Ammler> andythenorth: now I remember what I liked to tell you yesterday
15:41:49  <andythenorth> g st
15:41:49  <andythenorth> abort: data/psds/.DS_Store.i@e959df7694ce: no match found!
15:41:55  <Ammler> how did you remove the tag?
15:42:42  <andythenorth> hg tag --remove 0.4e
15:43:39  <Ammler> check the file .hgtags
15:44:44  <andythenorth> c3f2019098db57bd541e3c65db59807f82709cb4 0.4d
15:44:44  <andythenorth> fe3ff880ca5d676214cf7135d9cd249b32c864a9 0.4d
15:44:45  <andythenorth> afc9415f28fe11c5e2fa9c2678583469be8493cd 0.4e
15:44:45  <andythenorth> afc9415f28fe11c5e2fa9c2678583469be8493cd 0.4e
15:44:45  <andythenorth> 0000000000000000000000000000000000000000 0.4e
15:44:45  <andythenorth> 0000000000000000000000000000000000000000 0.4e
15:44:45  <andythenorth> 4bf66448ea2b9cb1a25de757ba9c4a77bd50f7a9 0.4e
15:44:52  <andythenorth> all those 0s??
15:44:55  <andythenorth> looks odd
15:47:17  <Ammler> I had edited the file directly
15:48:08  <Ammler> but it is good, now I know what I need to respect for the release farm
15:48:43  <andythenorth> is this related to my issue?  Or something else?
15:48:59  <andythenorth> I have a new clone of the repo and can restore my changes manually
15:49:25  <Brot6> ::DevZone:: World Airliners Set - Feature #190: A318 NFO @ (by Beardie27)
15:51:56  <Brot6> ::DevZone:: World Airliners Set - Feature #191: A321 NFO @ (by Beardie27)
15:52:00  <Ammler> andythenorth: no
15:52:07  <Ammler> it is just more hassle for me ;-)
15:52:12  <andythenorth> ok :(
15:52:15  <andythenorth> sorry about that
15:52:27  <Ammler> lol
15:52:37  <Ammler> thanks
16:02:05  *** FooBar_ has joined #openttdcoop.devzone
16:03:27  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 55: Cleanup: renamed psd files for trailers @ (by andythenorth)
16:09:37  <Ammler> andythenorth: if you now run "hg status" on the "clean" repo
16:09:42  <Ammler> what does it output?
16:10:31  <andythenorth> nothing
16:11:24  <andythenorth> hg log looks right for all the commits
16:11:43  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 56: Cleanup: rationalised filenames for pcx files @ (by andythenorth)
16:14:09  <Ammler> you should use your local hgignore for the mac specific files
16:14:53  <andythenorth> how do I create a local hgignore?
16:16:38  <Ammler> man hgignore
16:17:17  <andythenorth> :D
16:17:36  <andythenorth> (Google was not my friend in that case)
16:18:02  <Brot6> OpenGFX: nightly compile not needed. (r72)
16:18:42  <Ammler> ignore.other = ~/.hgignore2
16:18:54  <Ammler> in section [ui] of hgrc
16:19:33  <Ammler> so you have a "global" file for all your repos
16:21:51  <andythenorth> sounds dumb, but how do I know it's working?
16:23:23  <Ammler> hg st
16:23:36  <Ammler> if the files aren't listed anymore, it works :-)
16:23:52  <Ammler> but you might have them already in the repo ignore file
16:23:58  <andythenorth> ok
16:24:05  <andythenorth> thanks
16:24:26  <Ammler> just create a new "test repo"
16:33:32  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 57: Cleanup: comments about 'large bulldozer trailer' changed to '... @ (by andythenorth)
16:36:10  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 58: Cleanup: moved large float trailer within nfo file @ (by andythenorth)
16:42:38  <Brot6> ::DevZone:: World Airliners Set - Revision 32: Fixed A380-800 Emirates Window Error @ (by Beardie27)
16:42:38  <Brot6> ::DevZone:: World Airliners Set - Revision 33: Basic A321 Nfo Started Action 00 Correct @ (by Beardie27)
16:42:38  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 59: Cleanup: removed vehicle 'small drawbar' (ID 04) @ (by andythenorth)
16:56:10  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 60: Cleanup: moved 'large float trailers and sleds' to separate psd @ (by andythenorth)
16:58:57  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 61: Cleanup: removed large float trailer graphics from 'HEQS_bulld... @ (by andythenorth)
17:03:24  <Brot6> ::DevZone:: World Airliners Set - Revision 34: Added basic A321 Schemem list to Tracking Table @ (by Beardie27)
17:10:06  <Brot6> ::DevZone:: World Airliners Set - Revision 35: Fixed A380-800 Greyscales Windows @ (by Beardie27)
17:30:40  <Hirundo> Beardie: A file like Thumbs.db shouldn't be in a hg repository, methinks
17:32:36  <Ammler> Hirundo: maybe we should make a general ignore file for the community
17:33:38  <Hirundo> what would be placed in such a file?
17:34:45  <Ammler> all those general OS depended things
17:35:33  <Ammler> and some generic like *orig
17:35:47  <Ammler> *diff
17:35:52  <Ammler> etc
17:36:38  <Ammler> if I view the ignore files on our server, they are mostly independent from repo and should be installed local
17:37:16  <Ammler> Hirundo: how did you hide backup.push from the diff?
17:37:27  <Hirundo> -X backup.push
17:37:36  <Hirundo> and also -X .hgtags
17:37:44  <Ammler> for hg diff ?
17:37:49  <Hirundo> yes
17:38:12  <Ammler> maybe that could also be added to the hgrc?
17:39:38  <Ammler> [diff] doesn't seem to have something.
17:46:20  <Beardie> Hi Guys just wondering if i could have a little help getting my freind up and running for commits
17:46:27  <Beardie> hes got the keys
17:46:35  <Beardie> private and public created
17:46:46  <Beardie> just wondering what do i do next?
17:47:33  <Ammler> I hope, he didn't send this private key to you?
17:48:12  <Beardie> no lol
17:48:17  <Ammler> who is this "friend"?
17:48:20  <Beardie> Frank
17:48:34  <Beardie> hes allready registered on the site
17:48:35  <Ammler> did he register?
17:48:39  <Beardie> yes
17:49:09  <Ammler> ok, so we need his public key :-)
17:49:21  <Beardie> yes do i send it to you?
17:49:28  <Ammler> he could upload it to the files repo there
17:49:32  <Beardie> hes jsut gone for his tea lol
17:49:38  <Ammler> or you send it to me
17:49:57  <Beardie> ok going to have to wait for him to get back though
17:50:11  <Ammler>
17:50:23  <Beardie> put it in there and send the link to you?
17:50:43  <Ammler> well, it should be announced here
17:50:52  <Beardie> ok
17:50:59  <Ammler> I will remove it after I copied to the key repo
17:51:16  <Beardie> ok
17:51:25  <Ammler> :-)
17:52:00  <Beardie> as i said hes not here right now lol, he is having his dinner and he left his microphone on so i can hear them eat lol
17:52:28  <Ammler> hehe
17:53:40  <Ammler> just in case, you can do what ever you want with the public key, you can upload it to the public, just please NEVER share the private key, also not with your mother.
17:55:04  <Ammler> and if you think, it is lost, generate a new one and send it to us, it will always be worth to replace the keys.
17:55:45  <Beardie> ok lol
17:55:48  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 62: Fix: No. 8 Bulldozer was using incorrect trailer vehicles when... @ (by andythenorth)
17:55:51  <Ammler> best is, if you use passphrase, too.
17:56:20  <Beardie> so if i forget it make a new private and public keys and resend the public one to you :)
17:56:23  <Ammler> please, don't "lol", it is serious.
17:56:36  <Beardie> you mentioned mother how can you not lol at that
17:56:37  <Ammler> yep.
17:56:53  <Ammler> hehe, whoever,
17:57:22  <Ammler> specially never send it to someone asking for it.
17:57:50  <Beardie> looks like i better change it then becuase DJ asked for it becuase he thought it was broken
17:57:55  <Ammler> me or other admins will never ask for it, they would fool you.
17:58:18  <Beardie> i'll generate one now
17:58:35  <Ammler> I thought, you already did a new one?
17:59:01  <Brot6> ::DevZone:: World Airliners Set - Frank.pup @ (by Frank)
17:59:19  <Ammler> well, your private key can only break other repos, but you never know
17:59:31  <Ammler> maybe you will sometime get more privilegs
17:59:57  <Beardie> emm
18:00:09  <Beardie> DJ asked for my Private key and pass becuase he thought it was broken
18:00:16  <Ammler> hmm
18:00:26  <Beardie> since then i still have the same public and private key
18:00:28  <Ammler> he uploaded the putty key
18:00:49  <Ammler> Beardie: then please create a new one
18:00:55  <Ammler> I am here for the next time
18:01:01  <Beardie> i am noe frank has named that file wrong hes reuploading
18:01:28  <Ammler> <-- we need the key in the yellow box
18:01:58  <Ammler> not the one you get if you click save key
18:02:03  <Ammler> copy paste it
18:02:41  <Beardie> emm
18:02:57  <Beardie> ok so i make a public key and a private key and copy and paste that code into a notepad file
18:03:13  <Ammler> ?
18:03:31  <Beardie> so all you want is the code in the yellow box?
18:03:35  <Ammler> i.e.
18:03:38  <Ammler> or just here
18:03:47  <Ammler> you can PM it me
18:03:54  <Beardie> mine and franks?
18:03:56  <Ammler> yep
18:04:02  <Beardie> ok
18:04:06  <Ammler> exactly, that is why I made that screen
18:04:14  <Ammler> even if I don't use windows :-)
18:04:28  <Ammler> yep and yep :-)
18:06:11  <Brot6> ::DevZone:: World Airliners Set - Revision 31: Added Coded Column to Airbus Trackting Table @ (by Beardie27)
18:06:44  <Beardie> r31? i did that ages ago lol
18:06:47  <Beardie> ok pm sent
18:07:03  <Beardie> i think thats what you need?
18:07:53  <Ammler> PM sent?
18:08:02  <Ammler> ah, tt-forums?
18:08:11  <Beardie> yes lol
18:10:38  <Beardie> everything ok?
18:10:38  <Ammler> ok, your keys are added and your old removed.
18:10:41  <Ammler> try to commit
18:10:43  <Beardie> ok
18:11:00  <Ammler> Frank should clone the project with ssh
18:11:12  <Ammler> then he would have the right address right away
18:11:21  <Ammler> you need to change the private key now.
18:11:36  <Beardie> it works
18:11:46  <Beardie> a pull gave me no changes
18:12:06  <Beardie> so how do i get frank to clone to project?
18:13:12  <Ammler>
18:13:18  <Ammler> we have a guide for :-)
18:13:44  <Ammler> you can skip the mingw parts, if you don't wan't to use the Makefile
18:13:47  <Ammler> (for now)
18:14:22  <Ammler> <-- this might be enough for you
18:14:49  <Beardie> ok
18:15:48  <Beardie> thanks
18:17:11  <Ammler> and tell him, not to commit rubish like binaries and such ;-)
18:17:28  <Beardie> ok
18:17:51  <Ammler> hgignore is your friend
18:19:27  <Beardie> ok
18:19:34  <Beardie> when typing this "hg clone ssh://;project_name&gt"
18:19:38  <Beardie> with worldairlineset
18:19:42  <Beardie> at teh end
18:19:50  <Beardie> how does it know where to cloen it to?
18:19:54  <Beardie> clone*
18:20:53  <Beardie> no its ok i got it
18:21:15  <Ammler> hehe
18:22:28  <Ammler> <-- my personal VERY QUICK GUIDE :-)
18:23:17  <Beardie> <alias>? that "Frank"
18:29:01  <Beardie> nope got it again
18:30:28  <Ammler> :-)
18:30:36  <Ammler> usually, you don't need alias
18:50:35  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 63: Change: very large bulldozer trailer action 0/2/3 and real spr... @ (by andythenorth)
19:00:19  <Brot6> ::DevZone:: World Airliners Set - Revision 36: Changed Directory A321 Nfo from A320-200 @ (by Beardie27)
19:14:23  <Beardie> does anyone now alot about the Palette
19:15:03  <Beardie> for graphics editting
19:16:36  <XeryusTC> you have to use it!
19:17:19  <Beardie> yes well i have used a red
19:17:37  <Beardie> and it flashes yet the wiki says the other red is the flashing one
19:18:29  <Beardie> in PSP the red i have used is R252 G0 B0, yet the flashing one is R255 G0 B0
19:24:00  <Brot6> ::DevZone:: World Airliners Set - Revision 37: Added AirFrance, Alitalia A321 nfo @ (by Frank)
19:30:19  <Brot6> ::DevZone:: World Airliners Set - Revision 38: Added A321 to 7F @ (by Frank)
19:38:44  <Brot6> ::DevZone:: World Airliners Set - Revision 39: Updated A320 Co-ord File A321 Co-ords @ (by Beardie27)
19:43:14  <Ammler> Beardie: <-- might be interesting for you, too.
19:44:06  <Ammler> <-- PSP palette
19:47:00  <Beardie> Paint Shop Pro = PSP you get that?
19:48:24  <Ammler> ups :P
19:48:49  <Ammler> don't use those tools, I would use GIMP
19:48:51  <Beardie> i have a palette and i can make pcxs with Gimp
19:48:55  <Beardie> yes
19:48:57  <Beardie> i do
19:49:03  <Beardie> but i make graphics in paint shop pro
19:49:03  <Ammler> but?
19:49:16  <Beardie> i used a red and it flashes
19:49:40  <Ammler> action color
19:49:41  <Beardie> and its not in the fire section
19:49:55  <Ammler> how do you know?
19:50:12  <Ammler> there is also a GIMP palette
19:50:29  <Beardie>
19:50:32  <Beardie> that link
19:50:38  <Beardie> says which is which
19:50:58  <Beardie> i used the red which is in the normal section
19:51:18  <Ammler> is the "wrong" pcs already on the repo?
19:51:27  <Ammler> pcx*
19:51:41  <Beardie> yes
19:51:52  <Beardie> i coded it and it flashed
19:52:04  <Beardie> A320-200 Spanair winglets and the Iberia planes
19:58:13  <Brot6> ::DevZone:: World Airliners Set - Revision 40: Fixed Sprite Co-ordinates A321 nfo @ (by Frank)
19:58:17  <Ammler> you took the "Red Cicle" red
19:59:51  <Ammler> the palette in that pcx looks like the dos palette
20:01:27  <Ammler> you "can" use the dos palette, but then you need to encode with right parameters, iirc -m
20:02:54  <Beardie> humm
20:03:02  <Beardie> i used somthing called pal2.pal
20:03:05  <Beardie> in GIMP
20:03:22  <Beardie> Dj gave it me
20:03:30  <Brot6> ::DevZone:: World Airliners Set - Revision 41: Updated Coding Table with Concorde Info @ (by Beardie27)
20:04:28  <Ammler> the palette is fine
20:04:46  <Ammler> but if you use dos palette
20:05:02  <Ammler> you have to encode slighty other then the batch file does.
20:05:15  <Ammler> don't believe 2cc has dos colors.
20:05:16  <Beardie> Humm
20:05:31  <Ammler> it might be easier you just use windows onfly
20:06:01  <Beardie> maybe but where would i get that from
20:06:17  <Beardie> and all the graphics with have, have that palette on
20:09:22  <Ammler> well, it looks like you don't use many of the wrong colors, so they are already win compatible
20:09:40  <Ammler> just use another palette there, so you don't accidentially use dos only colors
20:09:57  <Ammler> this has nothing to do with your red, btw.
20:10:04  <Beardie> lol
20:10:27  <Ammler> it looks like there is no nice red for usual usage :-/
20:10:39  <Beardie> not even the one in the corner
20:10:58  <Ammler> but you mgiht need to ask others, I am very unexperienced with that :-)
20:11:11  <Beardie> ok lol
20:11:25  <Beardie> also what is a editor and watcher and reporter lol
20:11:38  <Ammler> remove them
20:11:54  <Beardie> remove them?
20:12:34  <Brot6> ::DevZone:: World Airliners Set - Feature #191: A321 NFO @ (by Frank)
20:16:55  <Brot6> ::DevZone:: World Airliners Set - Feature #191: A321 NFO @ (by Frank)
20:16:56  <Brot6> ::DevZone:: World Airliners Set - Feature #191: A321 NFO @ (by Frank)
20:16:56  <Brot6> ::DevZone:: World Airliners Set - Feature #191 (Closed): A321 NFO @ (by Beardie27)
20:24:12  <Brot6> ::DevZone:: World Airliners Set - Revision 42: Updated BAT file with bac folder @ (by Beardie27)
20:26:19  <Ammler> Beardie: djn gave you a very old version of his windows batch
20:26:42  <Ammler> grfcodec needs a grf as argument
20:26:53  <Ammler> you don't need -k fro renum
20:28:31  <FooBar_> Be careful with /not/ doing -k with renum: it might renum your original when you maybe don't want that. :)
20:28:57  <Beardie> old windows batch?
20:29:05  <Ammler> well, if you cat * > new.nfo
20:29:11  <Ammler> which you then delete
20:29:19  <Ammler> imo, -k is useless
20:29:37  <Beardie> well then there is no harm in leaving it
20:29:44  <FooBar_> -k is useful if you don't have a proper makefile ;)
20:29:49  <Ammler> and grfcodec ... *.nfo is just ugly.
20:30:03  <Beardie> it works though
20:30:15  <Ammler> that is why I say, it is ugly :P
20:30:23  <Beardie> lol
20:30:41  <Ammler> FooBar_: they have a makefile
20:30:49  <Ammler> well, some kind of
20:30:51  <FooBar_> they do?
20:30:56  <Ammler> something.bat
20:30:58  <FooBar_> last time I checked it was a batch file...
20:31:01  <FooBar_> ah :)
20:31:10  <Ammler> hehe
20:31:26  <Ammler> but if you read teh .bat, you agree, -k is uesless
20:31:38  <FooBar_> lemme check...
20:32:15  <FooBar_> yes indeed, as it already copies the original into an new file...
20:32:26  <Ammler> exactly
20:32:54  <Ammler> and do you know, how to make a ?nice red"
20:33:06  <Ammler> nice red*
20:33:14  <FooBar_> there are nice reds IIRC
20:33:29  <Ammler> hmm, if I check the palette, every red is some action
20:33:54  <FooBar_> not at all, there's a whole range of nice reds not being action colour.
20:34:07  <FooBar_> Let me upload my palette image I use for picking colours
20:34:09  <Ammler> is it possible to force a vehicle using company color red?
20:34:57  <Ammler> hmm
20:35:23  <FooBar_> using a recolour thingy maybe.
20:35:35  <Ammler> he indeed
20:35:35  <FooBar_> I bet DJNekkid knows such things
20:35:40  <Ammler> there is red :P
20:35:51  <Ammler> how did I overlook that line
20:36:02  <FooBar_> well, that red is perfectly usable as normal red as well.
20:37:15  <Ammler> which red?
20:37:42  <Ammler> win 184 is imo the best red
20:39:46  <Ammler> playing with colors on 2cc set is already a game in itself ;-)
20:40:08  <FooBar_> position 184 in my win palette is grey...
20:40:53  <FooBar_> best general purpose red imo is #e00000
20:40:53  <Brot6> ::DevZone:: #openttdcoop - ttdwin.png @ (by foobar)
20:40:53  <Brot6> ::DevZone:: #openttdcoop - Document: Colour picking image @ (by foobar)
20:40:53  <Brot6> ::DevZone:: World Airliners Set - Revision 43: Basic Update to Concorde Co-ords file @ (by Beardie27)
20:41:09  <FooBar_> well, there's my palette image
20:42:33  <Ammler> you have reordered it?
20:42:45  <FooBar_> In the image I uploaded: yes
20:42:52  <FooBar_> well, Purno did
20:43:27  <FooBar_> for 184 I looked in what I think is the original palette, i.e. my photoshop palette file
20:43:54  <andythenorth> I did start labelling the photoshop palette.
20:44:28  <FooBar_> Is that useful for something?
20:44:30  <andythenorth> When used as a swatch, the colours can be named, which will then show as a tooltip in photoshopo
20:44:35  <andythenorth> shopo?
20:45:48  <FooBar_> A swatch is useful though
20:46:45  <Ammler> that is the ttd palette with numbers.
20:48:08  <FooBar_> Photoshop at least shows it the other way round.
20:48:24  <FooBar_> Including index numbers
20:49:09  <Ammler> zeph has a nice palette
20:49:16  <FooBar_> so either this image is wrong or photoshop is weird :)
20:49:29  <Ammler> my image is like the ttdpatch wiki
20:49:53  <Ammler>
20:50:55  <Ammler> index 0 does show the transparent color
20:51:17  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 64: Feature: added new graphics for large bulldozer trailer (belly... @ (by andythenorth)
20:51:17  <Brot6> ::DevZone:: World Airliners Set - Revision 44: Added 2 Concorde Pcx Files, (Greyscale + AirFrance) @ (by Beardie27)
20:54:24  <FooBar_> well, photoshop puts the transparent blue in 255...
20:54:48  <FooBar_> It probably internally handles it the other way round, as I never had problems with it...
20:55:09  <Ammler> and I don't have experience at all :P
20:55:46  <Ammler> opengfx monolev was my first and only attempt with graphics :-)
20:56:53  <Ammler> andythenorth: you should enable bakcup for heqs
20:57:06  <Ammler> maybe you could use the firs place
20:57:39  <andythenorth> Ammler: what do I need to do?
20:58:08  <Ammler> <-- quite simple
20:58:29  <Ammler> or do you have a mercurial running on your tt-factory server?
20:58:49  <Ammler> you could also push there
20:59:15  <Ammler> else just ask FooBar_ to create a heqs account at firs
20:59:25  <FooBar_> you can indeed put it in the FIRS place I suppose...
20:59:29  <Ammler> s/account/repo/
20:59:39  <FooBar_> FIRS is currently just 10 MB and I have 100 available there...
20:59:42  <Ammler> you have 150 MB space per user
21:00:03  <FooBar_> 150? even better! I recalled 100...
21:00:15  <Ammler> he
21:02:20  <FooBar_> repo created at: ssh://
21:02:50  <FooBar_> Ammler: you're correct: "You are currently on the free plan, using 2.5 MB out of 150.0 MB total (2%)."
21:05:13  <Ammler> we were thinking about making the devzone there
21:06:49  <Brot6> ::DevZone:: Heavy Equipment Set - Revision 65: Meta: added backup.push file (backing up to FIRS bitbucket repo) @ (by andythenorth)
21:09:56  <Ammler>  <-- FooBar_, idea, why image magick creates those black?
21:10:24  <FooBar_> no idea. I've never worked with image magick
21:11:11  <Brot6> ::DevZone:: World Airliners Set - Revision 45: Finished Concorde Co-ords @ (by Frank)
21:32:24  <Brot6> ::DevZone:: World Airliners Set - Revision 46: Removed Concorde Co-ords File @ (by Beardie27)
21:34:25  <Beardie> Ammler Frank doesn;t get Green ticks on the files any idea why not?
21:35:11  <Ammler> FooBar_: ^?
21:35:23  <FooBar_> Did he install TortoiseHg?
21:35:24  <Ammler> Beardie: I don't have tortoise
21:35:26  <FooBar_> I suppose so...
21:35:30  <FooBar_> Do a reboot
21:35:52  <Beardie> yes he has Totoise
21:35:55  <Ammler> he could run hg st in the console
21:35:57  <Beardie> maybe a rebott might do it
21:36:06  <FooBar_> tell you what: they disappeared here as well :S
21:36:10  <Ammler> and hg verify
21:36:29  <Ammler> maybe you need to "refresh" ?
21:36:42  <FooBar_> nah, F5 doesn't do any difference...
21:37:07  <Beardie> anyway got a new error,
21:37:43  <Beardie> see hc resolve
21:38:31  <Beardie> unresolved merge conflisvts
21:38:40  <Beardie> this is what frank is getting any ideas again
21:40:10  <FooBar_> do a merge
21:40:16  <FooBar_> i.e. hg merge
21:40:39  <Beardie> which will do what?
21:41:20  <FooBar_> merge whatever is conflicting
21:41:28  <Beardie> ok
21:41:46  *** andythenorth has quit IRC
21:41:47  <FooBar_> I suppose you were both working on the same file
21:42:12  <Brot6> ::DevZone:: World Airliners Set - Revision 47: Re added Concorde Spirte Co-ords File @ (by Beardie27)
21:43:34  <Beardie> its ok now
21:44:58  <Beardie> right guys?
21:45:02  <Beardie> when frank does a commit
21:45:14  <Ammler> it isn't readded
21:45:19  <Ammler> it is merged ;-)
21:45:25  <FooBar_> if it's not OK, hg will tell you ;)
21:45:25  <Beardie> he gets "abourt, unreloved mergs conflicts"
21:46:01  <Ammler> tell frank, he should always hg pull -u before commit
21:46:08  <Ammler> if it's possible
21:46:13  <Beardie> he did
21:46:50  <Beardie> just before he did this commit he did a pull
21:47:01  <Beardie> it said "no changes found"
21:47:17  <FooBar_> then you shouldn't need to merge... :S
21:47:38  <Beardie> extaclly thats the problem
21:48:15  <Ammler> he
21:48:21  <Ammler> why is that a problem?
21:48:29  <Beardie> well becuase he can;t commiy
21:48:31  <Beardie> commit*
21:48:40  <Beardie> he does a pull no changes found
21:48:47  <Ammler> if there is no change
21:48:51  <Ammler> what should it commit?
21:48:51  <Beardie> he adds file (this works fine)
21:49:10  <Ammler> then he is up2date
21:49:21  <Beardie> then he does a hg commit and gets the error stated "abourt, unreloved mergs conflicts"
21:49:47  <Beardie> thats as far as he gets
21:49:52  <Ammler> then he should merge
21:49:55  <Ammler> hg merge
21:50:02  <FooBar_> maybe some previous conflict then... indeed, do a merge
21:50:20  <Beardie> hes doing it
21:50:20  <Ammler> hg heads would tell you that
21:50:21  <FooBar_> this will probably pop up k3diff, which is, well, hard to understand
21:50:31  <Ammler> if you have 2 heads, you need to merge
21:50:47  <Ammler> FooBar_: but very nice
21:51:25  <Beardie> "abort, outstanding uncommited merges, no files or dictorys specidied"
21:51:28  <FooBar_> Ammler: once you understand it: yes. I read the theory behind it in the hg book :)
21:51:45  <Ammler> Beardie: if you both worked on the same file, then it would need conflict resolving, most likely, but I don't assume that.
21:52:18  <Ammler> FooBar_: I resolve such conflicts with vi or kdevelop
21:52:36  <Beardie> could frank not re clone it>
21:52:39  <Beardie> ?*
21:52:40  <Ammler> I was quite suprised about the tool, as I tested windows tortoise
21:52:54  <Ammler> Beardie: that shouldn't be needed
21:53:11  <Ammler> does he have to heads?
21:53:14  <Ammler> two*
21:53:23  <Beardie> but for us easiest because i havn;t a clue how to fix such a problem
21:53:27  <Ammler> hg heads
21:53:49  <Ammler> if is one of the heads a commit from him
21:53:56  <Ammler> he mgiht be able to rollback
21:54:03  <Ammler> and commit that after
21:54:13  <Ammler> but a merge is easy.
21:54:28  <Beardie> there are two heads ones mine ones his
21:54:44  <Ammler> does he have 2 heads?
21:54:51  <Beardie> you saya a merge is easy but we don;t know what to type
21:55:06  <Ammler> and what happens if he "hg merge"
21:55:06  <Beardie> yes he has 2 heads one mine one his
21:55:27  <Ammler> hg merge
21:55:29  <Beardie> hg merge = ""abort, outstanding uncommited merges, no files or dictorys specidied"
21:55:41  <Ammler> hg ci
21:56:00  <Beardie> same message
21:56:12  <Beardie> unresolved merge conflicts
21:56:13  <Ammler> hg rollback
21:56:19  <Beardie> see hg relsove
21:56:32  <Beardie> ok hes typing ti
21:56:41  <Beardie> rollback complete
21:57:01  <Beardie> should it work now?
21:57:21  <Ammler> no
21:57:27  <Ammler> now
21:57:28  <Ammler> hg heads
21:57:36  <Ammler> still 2?
21:57:45  <Beardie> yes
21:57:53  <Beardie> mine and his appear
21:58:15  <Beardie> there has been three revisions by me since his
21:58:15  <Ammler> hg up
21:58:22  <Ammler> hmm
21:58:37  <Beardie> "uncommited merges"
21:58:43  <Ammler> hg ci
21:59:06  <Beardie> "unreloved merge conflicts"
21:59:17  <Ammler> mäh
21:59:21  <Ammler> hg resolve
21:59:46  <Beardie> use --all to remoerge all files?
21:59:58  <Beardie> no files or directory specified
22:00:01  <Ammler> did you work at the same time on same files?
22:00:13  <Beardie> well i don't think
22:00:15  <Beardie> so
22:00:29  <Ammler> maybe he should strip his commit
22:00:34  <Beardie> i changed a a file and then asked him to finish it
22:00:45  <Ammler> hg stripe <hisrev>
22:01:09  <Beardie> stripe?
22:01:12  <Beardie> no strip?
22:01:19  <Ammler> yes
22:01:46  <Ammler> well, he should then hg pull -u before he begin to edit a file
22:01:52  <Beardie> he did
22:02:06  <Beardie> becuiase he cound't of see me start it
22:02:18  <Beardie> stripe unknown command
22:02:48  <Beardie> hes registering here in the forum
22:02:55  <Beardie> so he will be jhere in a moe
22:02:55  <Ammler> without e
22:03:06  <Ammler> strip
22:03:09  <Beardie> ok
22:03:22  <Beardie> unknown command
22:03:27  <Beardie> hg strip 45
22:03:31  <Ammler> hmm
22:03:40  <Ammler> it is a extension
22:03:54  <Ammler> maybe better not using it.
22:04:04  <Brot6> heqs: Backup push to ssh:// initiated.
22:04:23  <Ammler> Beardie: he should backup the change he did and then make a fresh clone
22:04:28  <Ammler> might be the easiest
22:04:39  <Beardie> well i have the change now and i put it on
22:04:50  <Beardie> he sent it me via another program
22:05:06  <Beardie> so allfiles are up to date
22:05:22  <Ammler> the problem is, he did commit before pull
22:05:55  <Ammler> if he would have done the pull before, he could ahve solved the merge without a commit.
22:06:21  <Ammler> Beardie: you might as well make a Backup repo on
22:06:44  *** Frank95 has joined #openttdcoop.devzone
22:06:44  <Ammler> os whereever there are mercurial hosting.
22:06:52  <Beardie> Franks here
22:07:01  <Frank95> hello
22:07:04  <Beardie> frank95? lol
22:07:11  <Ammler> heya Frank95 :-)
22:07:24  <Beardie> i think its meant to be just Frank
22:07:29  <Ammler> is that your bithyear?
22:07:33  <Frank95> no
22:07:41  <Frank95> just a random number
22:07:47  <Beardie> I am 18 and so is frnak so no lol
22:07:54  <Beardie> we live in the same village
22:08:07  <Ammler> yeah, well, there are younger on tt-forums :-)
22:08:16  <Beardie> anyway ammler suggests a fresh clone
22:08:39  <Ammler> :-)
22:08:44  <Ammler> I gave up :-(
22:08:49  <Beardie> wh:(
22:08:58  <Beardie> ignore the wh
22:09:04  <Beardie> how does doa  fresh clone then
22:09:08  <Beardie> do*
22:09:21  <Ammler> that would be no problem
22:09:51  <Ammler> that is a new clone
22:10:03  <Ammler> rename the existing repo
22:10:09  <Ammler> and clone
22:10:18  <Ammler> like you did the first time.
22:10:25  <Frank95> wait a minute
22:10:29  <Beardie> ok whats goes after the "hg clone" i can;t remember lol
22:10:36  <Beardie> brb
22:10:58  <Ammler>
22:11:18  <Ammler> there is a link on top of the devzoen "Guide" ;-)
22:11:50  <Frank95> so hg clone and then that
22:12:10  <Ammler> <-- the very short guide
22:12:34  <Ammler> <-- the much better quide
22:14:47  <Frank95> doing
22:16:33  <Frank95> yh
22:16:37  <Beardie> Ammler you remove the watcher, reporter etc for DJ?
22:16:38  <Frank95> ty for that ammler
22:17:16  <Ammler> he, I tried something on your repo
22:17:21  <Ammler> but failed,
22:17:29  <Ammler> with code review.
22:17:31  <Beardie> what lol?
22:17:36  <Beardie> code review?
22:18:00  <Ammler> there is a plugin, which you could comment the code
22:18:54  <FooBar_> I'm off to bed. Good luck with the repo, and  good night ;)
22:19:01  *** FooBar_ has quit IRC
22:21:02  <Ammler> Beardie: as dev, he has already those access, he don't need to be watcher etc.
22:21:22  <Ammler> but feel free to add them again.
22:27:32  <Beardie> ok
22:27:44  <Beardie> frank is getting unable to open connection
22:27:50  <Beardie> he recloned it wrong
22:28:01  <Beardie> ended up in a double folder
22:28:32  <Beardie> so he deleted it all
22:28:40  <Beardie> and now hes trying to hg clone
22:30:31  <Frank95> nvm its cos i'm half asleep
22:35:28  <Brot6> ::DevZone:: World Airliners Set - Revision 48: Basic Concorde nfo @ (by Frank)
22:39:08  <Frank95> yh it we finally fixed it
22:39:31  <Frank95> ty for the help, sorry i'm a noob
22:39:54  <Brot6> ::DevZone:: World Airliners Set - Revision 49: Updated A320-200 Spanair.png @ (by Beardie27)
22:44:02  <Brot6> ::DevZone:: World Airliners Set - Revision 50: Updated A320-200 Spanair.pcx @ (by Beardie27)
22:46:09  <Brot6> ::DevZone:: World Airliners Set - Revision 51: Updated Concorde Nfo Vehicle ID @ (by Beardie27)
22:48:20  <Brot6> ::DevZone:: World Airliners Set - Revision 52: Resorted Concorde Pcxs into Correct Folder @ (by Beardie27)
22:54:02  <Brot6> ::DevZone:: World Airliners Set - Revision 53: Remove Greyscale and Airfrance pcx, BAC @ (by Frank)
22:58:54  <Brot6> ::DevZone:: World Airliners Set - Revision 54: Updated (2nd Time) Spanair.png and Spanair.pcx @ (by Beardie27)
23:01:17  <Brot6> ::DevZone:: World Airliners Set - Revision 55: Added Concorde into 7F_english @ (by Frank)
23:04:44  <Brot6> ::DevZone:: World Airliners Set - Revision 56: Changes made to 00header @ (by Frank)
23:07:57  <Beardie> Ammler?
23:08:04  <Beardie> You There?
23:08:53  <Ammler> What have I told you :P
23:09:05  <Ammler> I am always here ;-)
23:09:13  <Beardie> lol
23:09:17  <Frank95> lol
23:09:18  <Beardie> we have come across a error
23:09:27  <Ammler> again?=
23:09:29  <Beardie> i was writing a commit whilst frank pushed
23:09:37  <Beardie> so when i pused i got a error abour merging
23:09:55  <Beardie> which i can't get rid of
23:09:55  <Ammler> yeah
23:10:01  <Ammler> yep
23:10:05  <Ammler> so just pull
23:10:06  <Beardie> becuase i don't know how
23:10:08  <Beardie> ok
23:10:15  <Ammler> then merge
23:10:20  <Ammler> then commit
23:10:23  <Ammler> then push
23:10:24  <Beardie> but how does the merge work?
23:10:32  <Beardie> hg merger?
23:10:40  <Beardie> merge*
23:10:46  <Beardie> that it?
23:10:49  <Ammler> if you didn't again work on exactly the same thing
23:10:57  <Ammler> it should be no problem
23:11:07  <Frank95> we weren't
23:11:09  <Ammler> hg pull
23:11:15  <Ammler> hg merge
23:11:16  <Ammler> hg ci
23:11:18  <Ammler> hg push
23:11:56  <Ammler> hg pull -u
23:12:05  <Ammler> or hg update there :-)
23:12:28  <Beardie> Brank 'default" has theree heads -  please merge with explicit rev
23:12:35  *** Beardie has quit IRC
23:13:02  <Frank95> he'll b bck in a min
23:13:04  <Ammler> seriously, we never had issues with merging
23:13:07  *** Beardie has joined #openttdcoop.devzone
23:13:11  <Beardie> sorry back
23:13:15  <Beardie> so i got that error
23:13:19  <Beardie> branch*
23:13:27  <Beardie> was the misspelt word
23:13:38  <Ammler> 3?
23:13:43  <Beardie> yes lol
23:13:55  <Ammler> what are you guys doing?
23:14:03  <Beardie> one seems to be franks from like a hour ago
23:14:07  <Beardie> updating files why
23:14:25  <Beardie> i am changing a whilst frank is working on a Conocde.nfo
23:14:28  <Beardie> png*
23:14:29  <Frank95> that will b wen i messed up
23:15:05  <Ammler> do you always update when you pull?
23:15:14  <Frank95> no
23:15:29  <Frank95> if u mean hg update anyway
23:15:31  <Ammler> it looks like you just pull without update
23:15:41  <Beardie> update?
23:15:41  <Ammler> so you get different heads
23:16:03  <Frank95> if u mean if files change thn yes
23:16:33  <Ammler> do you work how the guid tells?
23:16:35  <Ammler> hg pull -u
23:16:38  <Beardie> yes
23:16:44  <Beardie> hg commit....
23:16:48  <Beardie> hg push.....
23:16:59  <Frank95> that's wat i did
23:17:02  <Beardie> frank pushed some other files whilst i was writing a commit
23:17:14  <Beardie> when i went to push seconds later i got a merge message
23:17:24  <Ammler> that is ok
23:17:30  <Ammler> then you can just pull -u
23:17:34  <Ammler> and merge
23:17:40  <Beardie> but i seem to have three heads one is from when franks buggerered up a hour ago
23:17:52  <Beardie> and the other two are the recent ones
23:17:58  <Beardie> the most recent ones*
23:18:15  <Ammler> maybe you need to "repair" your repo too :-)
23:18:42  <Beardie> lol
23:18:44  <Frank95> lol
23:18:53  <Beardie> i need to re clone lol
23:19:01  <Ammler> you should always be sure, that you update
23:19:05  <Ammler> not just pull
23:19:22  <Frank95> wat u mean
23:19:25  <Ammler> and if the update worked.
23:19:32  <Beardie> whats the different?
23:19:32  <Frank95> hg update or hg pull -u
23:19:38  <Ammler> different?
23:19:40  <Beardie> is there a difference
23:19:48  <Beardie> between hg update and hg pull -u
23:19:55  <Ammler> hg pull -u = hg pull && hg update
23:20:05  <Frank95> right
23:20:42  <Beardie> well i always use hg pull -u
23:20:43  <Ammler> Frank95: do you have same tip as the server now?
23:20:45  <Ammler> hg tip
23:20:54  <Frank95> yh
23:21:06  <Ammler> and hg heads is only one?
23:21:08  <Beardie> i don't have the one i was trying to push
23:21:27  <Beardie> i don't, i have the revision i was trying to push before***
23:21:56  <Ammler> Beardie: you could hg rollback and hg revert
23:22:02  <Beardie> hg revert?
23:22:10  <Ammler> but then you need to save your changes
23:22:24  <Ammler> if you have still 2 heads
23:22:34  <Beardie> ok
23:22:42  <Frank95> i have 2 heads
23:22:43  <Ammler> it might be best, you clone again new.
23:23:01  <Ammler> hg revert does delete all changes, which aren't commited
23:23:07  <Frank95> 45 and 56
23:23:14  <Beardie> yes i think so i can still se franks revision in the gh heads from a hours ago
23:23:19  <Ammler> Frank95: BAD
23:23:24  <Ammler> very bad
23:23:30  <Beardie> i see 45 as well
23:23:34  <Beardie> its the one from a hour ago
23:23:38  <Ammler> I thougtht, you made a fresh clone?
23:23:47  <Frank95> i did
23:24:12  <Beardie> its rev 45 its annoying us lol
23:24:56  <Ammler> did you force the push?
23:25:10  <Frank95> yh it told me to
23:25:24  <Ammler> the server repo is broken, either :-(
23:26:00  <Beardie> so this is not good?
23:26:02  <Frank95> great
23:26:34  <Beardie> so what we have to restart the repo?
23:26:44  <Ammler> well
23:26:47  <Beardie> or something?
23:26:51  <Ammler> I will merge on the server
23:26:57  <Beardie> ok
23:26:58  <Ammler> I should be able to
23:27:03  <Beardie> fix it?
23:27:43  <Ammler>
23:27:54  <Ammler> you see r45 never merged :-)
23:28:09  <Frank95> that gd?
23:28:27  <Beardie> or is your smily face folling us?
23:29:15  <Beardie> ok so fixable?
23:29:21  <Beardie> can i go to bed?
23:29:30  <Beardie> and not loose sleep lol
23:30:57  <Ammler> please add the thumbs.db to the ignore list
23:31:09  <Beardie> ok where is the ignore list?
23:31:50  <Beardie> look i really need to go so i need to know if you need anything off me and is this fixable?
23:33:45  <Ammler> I merged and fixed
23:33:53  <Ammler> please pull again
23:33:55  <Ammler> and -u
23:34:08  <Beardie> ok
23:34:10  <Brot6> ::DevZone:: World Airliners Set - Revision 57: Merge: r45 from Frank @ (by ottdc@mozart)
23:34:10  <Brot6> ::DevZone:: World Airliners Set - Revision 58: Cleanup: removed some Thumbs.db @ (by ottdc@mozart)
23:34:28  <Beardie> abort crosses branks
23:34:32  <Beardie> branches
23:34:47  <Frank95> mine has removed the head
23:34:52  <Frank95> only one now
23:34:57  <Beardie> mines aborts
23:35:08  <Ammler> well, the server repo is fine
23:35:16  <Beardie> but i have two heards
23:35:25  <Frank95> u'll prob have to re clone
23:35:40  <Ammler> did you backup your change?
23:35:40  <Beardie> yes imwill in the morning
23:35:43  <Beardie> yes
23:35:51  <Ammler> yep
23:35:59  <Ammler> well, that doesn't hurry anymore
23:36:00  <Beardie> but the heads are right now
23:36:05  <Ammler> as the server repo is fine :-)
23:36:12  <Beardie> great sorry about this error
23:36:22  <Frank95> ty for the help ammler
23:36:25  <Ammler> I really wonder, how you reached to push that.
23:36:26  <Beardie> kinds just been rev 45 effecting everything all night
23:36:39  <Ammler> never saw that before.
23:36:50  <Ammler> it looks like you forced
23:36:57  <Frank95> it tld me to
23:36:59  <Beardie> frank dod
23:37:03  <Beardie> did*
23:37:06  <Ammler> well, nvm.
23:37:09  <Beardie> lol
23:37:14  <Ammler> it should be fine now :-)
23:37:14  <Frank95> ty anyway me and beardie are off
23:37:21  <Frank95> 00.37 here
23:37:38  <Ammler> well, +1 here :P
23:37:41  <Beardie> yes quick question where are you ammler in the world?
23:37:52  <Ammler> CH-Alpes
23:38:05  <Beardie> Neat!!
23:38:10  <Frank95> lol, how do u concentrate at 01.38
23:38:17  <Beardie> beats this little corner of england any day
23:38:33  <Ammler> that is easier then on the early morning :-P
23:38:50  <Beardie> well i am off now
23:38:53  <Beardie> night
23:38:53  <Ammler> England is nice
23:38:56  <Beardie> and thanks
23:38:57  <Beardie> lol thanks
23:38:58  <Ammler> good night
23:39:02  <Beardie> good night ammler
23:39:10  <Beardie> bye
23:39:12  *** Beardie has quit IRC
23:39:57  <Frank95> cya ammler, sorry i didn't quite know what to do and messed everything up, ty for ur time, cheers
23:40:21  <Ammler> well
23:40:36  <Ammler> you have to start somehow, don't worry
23:40:50  <Frank95> lol
23:40:57  <Frank95> cya
23:41:07  *** Frank95 has left #openttdcoop.devzone

Powered by YARRSTE version: svn-trunk