Transport Tycoon Forums

planetmaker wrote:The hg repository is reachable at http://mz.openttdcoop.org:8000/ -mind the port number.

I know that's where the repositry is, but either both tortoiseHG and the bash interface are set up wrong, or there's something they don't like about that repositry, because neither can locate it.

i tried TortoiseHG and it worked fine, i get the repository and compile the version.

but how to know which version we get ?
on which Trunk are you based for your patch ?

Solved it. I was using an old version.
But Chico has a point... which trunk revision is this based against?

Gremnon wrote:Solved it. I was using an old version.
But Chico has a point... which trunk revision is this based against?

Just check the log which show just at that link, if you paste it in your browser. The last merge with trunk was r14736 - quite some changes since...

Hmm... inconvenient... but no matter, thanks for that useful bit of info... might help me see if i can patch it into a more recent build...

Hi,

Have you any idea how to update my custom ottd build. I have first applied my custom patches against openttd trunk revision 14536. Then I applied IS patch which was made againts same trunk revision. After that I made some couplings between IS and my patches. Now I would like to update my patches and IS patch to trunk revision (svn r14736) but problem is that IS has been moved to mercurial. Actually I would like to update them to more reacent trunk revision but IS is not updated.

Which way to go?

1. Shall I first update my custom patches against trunk revision (svn r14736) an then merge them with current IS revision? Can svn patch/diff files be applied to mercurial repo?

2. Is it possible to get patch/diff file between IS mercurial repo and svn trunk which could be applied to svn repo. So I could continue developing my patches against svn repo, couldn't I?

Maybe the question is: Which way is easier: Try to get IS back to svn repo or move my patches to IS repo.

I studied mercurial and managed to get latest revision from IS repo. I also managed to make diff file between IS revision e17a18bb827f (svn r14536) and IS tip revision. Unfortunately diff file was broken due language file encondings. Which encoding should be used? I also tried to apply diff to svn truck revision (svn r14736) with no success.

Hopefully you understood my point(I am not sure myself:), if not, please ask!

Hi,

escopena wrote: 1. Shall I first update my custom patches against trunk revision (svn r14736) an then merge them with current IS revision? Can svn patch/diff files be applied to mercurial repo?

Sure they can. hg just is a version tracking system (a quite good one); the source can be patched as usual. Which way you go updating you patches, which first - that's mostly not an issue and doesn't matter much unless they conflict. Then there's no general solution. Best update everything to trunk seperately and then try to merge.

2. Is it possible to get patch/diff file between IS mercurial repo and svn trunk which could be applied to svn repo. So I could continue developing my patches against svn repo, couldn't I?

Also that is possible:
hg diff -rVERSION1:VERSION2 > patchfile.diff
works nicely. See hg help diff for more. That patch file needs to be applied with patch -p1 (instead of -p0 as usual svn procedure is).

Maybe the question is: Which way is easier: Try to get IS back to svn repo or move my patches to IS repo.

Well, you can do what you like. Personally I found it quite helpful to use mercurial queues (hg queues) for maintaining a number of patches which shall work jointly. It combines both: the ease to update a single patch at a time, saves MUCH hassle on integration and gives you easy as pie a joint patch. So I recommend to get a diff of IS to trunk it was last and then maintain all your patches, including IS, using hg queues. That's what I do in order to obtain things like http://trac.openttdcoop.org/changeset/564
Further, it's easy as pie to take out a single patch which just won't apply anymore or needs more fixing than you currently have time for. Later you can add it as easy again.

I studied mercurial and managed to get latest revision from IS repo. I also managed to make diff file between IS revision e17a18bb827f (svn r14536) and IS tip revision. Unfortunately diff file was broken due language file encondings. Which encoding should be used? I also tried to apply diff to svn truck revision (svn r14736) with no success.

I understand that some file encoding gives you problems, but I don't follow here. I never had that when it came to patches...

regards,
pm

EDIT: all this said, I'm really happy that you try to keep IS up to date with current trunk. I'm currently just missing the time :S

are you still working on the project ?

no updates in mercurial since 4 weeks :s

I'm afraid, as it seems, I'll have to drop maintaining IS. Because with all the recent changes to trunk (especially inclusion of 15 companies as opposed , but also others, it - again - would rather mount to a re-write... And currently I just don't have the time to completely re-write a patch of this magnitude. There's after all, something called real life, too...

Anyone who feels like doing some serious work on this topic, please, contact me. The right to submit to the hg repository (or the possibility to actually create a new one, if desired) are there .

arf, is there any hopes we get at least a final patch file for IS ?!

it's really a great patch for online playing, i hopes that OTTD Devs will include it.

Chico008 wrote:arf, is there any hopes we get at least a final patch file for IS ?!

it's really a great patch for online playing, i hopes that OTTD Devs will include it.

I think he's saying because of changes that have already been made to trunk its going to take too much time to write the next patch, so unless i'm corrected by the release of one, i think that's all for now... So no final release...

A shame really, right since i opened TTO (without the world editor even being released yet... so a hell of a time ago) i always wanted track sharing implemented as standard... I hoped TTD would bring it, it didn't, i then hoped the genius of Mr Drexler (and the rest) would bring it to TTDPatch, it didn't, so this patch was my best hope for a release into the OTTD trunk

JacobD88 wrote:A shame really, right since i opened TTO (without the world editor even being released yet... so a hell of a time ago) i always wanted track sharing implemented as standard... I hoped TTD would bring it, it didn't, i then hoped the genius of Mr Drexler (and the rest) would bring it to TTDPatch, it didn't, so this patch was my best hope for a release into the OTTD trunk

I have to admit that this patch coupled with cargodest is definitly the ULTIMATE modifications to have fun in multiplayer friendly-party ! Life is hard with dreamy players sometimes...

JacobD88 wrote:i always wanted track sharing implemented as standard... I hoped TTD would bring it, it didn't, i then hoped the genius of Mr Drexler (and the rest) would bring it to TTDPatch, it didn't

Um ... experimentalfeatures.cooperative?

DaleStan wrote:

JacobD88 wrote:i always wanted track sharing implemented as standard... I hoped TTD would bring it, it didn't, i then hoped the genius of Mr Drexler (and the rest) would bring it to TTDPatch, it didn't

Um ... experimentalfeatures.cooperative?

Ah, wasn't aware of that feature... which revision did it appear in? I stopped using TTPatch in 2006/7, that feature and Custom Bridge Heads may switch me away from OTTD once more

JacobD88 wrote: I stopped using TTPatch in 2006/7, that feature and Custom Bridge Heads may switch me away from OTTD once more

your choice! nobody's going to stop you!

Okay, I downloaded the patch to work with version 14422 then went and downloaded that version using the instructions in this post: http://www.tt-forums.net/viewtopic.php?p=725810#p725810

When I run make it goes through and does the compile. So what do I do after that? I've never worked with patching or compiling a version of OTTD.

nm2588 wrote:Okay, I downloaded the patch to work with version 14422 then went and downloaded that version using the instructions in this post: http://www.tt-forums.net/viewtopic.php?p=725810#p725810

When I run make it goes through and does the compile. So what do I do after that? I've never worked with patching or compiling a version of OTTD.

if you did everything in exactly that order as described there, you should have a working binary with infrastructure sharing capabilities. You need to check out and change the advanced settings (or patch settings) in order to enable it.

what do I need to copy over to my install of OTTD? I got to that part and don't know where to go from there.

From the bundle directory, copy across the binary and the language files.

If you have your base grf, your config file and the newgrf you want to use in the central directory as described in the readme you don't need to do anything. Just start the binary.

EDIT: For windows it should be something along the lines of C:\My Files\OpenTTD