resurrection of diagonal level and clear patch

[petert]

Hi fonso,
This time I tried using "git clone <repo>", then "git checkout origin/diaglvl". I wanted to ask you some more questions on IRC, but you had already left (basically how to do that "master/trunk" branch, so I can update/merge again before compiling). r18790 built on MSVC.

Disclaimer:
If diaglvl crashes, do not report it to the OpenTTD developers. Report it to this thread. When making your post about the crash, please upload the crash.dmp, crash.log, crash.sav, and crash.png (only available as of r18184, so if you are using a build older than that, don't bother). These files are vital to finding what happened during the crash. For developers, you can find the PDB file and other files at this site: http://users.tt-forums.net/petert/dev/

Peter

[fonso]

petert: you can create a master branch either by checking out the official openttd repository or my branch called "master":

Code: Select all

git checkout -b master origin/master

There's also quite extensive documentation on git. As a first step if you have specific questions for some command you can do "git help <command>". For example "git help clone". Then there is additional documentation online, for example here: http://git.or.cz/gitwiki/GitDocumentation

Also note that you don't need separate copies of the repository for diaglvl and cargodist (or anything I do, actually). They are all in the same repository here and you can just replicate their branches locally and change between them with "git checkout <branch>". You should need "git clone" exactly once, when initially cloning the repository. Later you can do "git pull" or "git fetch" which should be significantly faster.

[petert]

Hi fonso,
When you merge diaglvl with trunk and you discover a conflict, what do you do to solve it? Is there some kind of .rej while like when patching?

[fonso]

The conflicts show up in the conflicting file itself. You have to edit the file to resolve them. Look for lines starting with "<<<<", ">>>>" and "====". It's pretty self-explanatory.

[petert]

Then what does ">>>>" and "<<<<" stand for? Insert or delete?

[ChillCore]

Mine is is this case fonso's code. Theirs is in this case code changed by trunk.
As trunk does not know what you changed, in this case fonso's patch you applied before bumping, and git can not figure out what to do with what and where, it is up to you to merge the two into working code.
Welcome to programming.

Little warning:
If fonso decides to fix it in an other way than you did. There are two branches. To keep in compliance with the GPL liscence, you MUST provide sources for posted binaries up to three years after posting, IIRC, to anyone who asks for them. If you provide a patch inside the binary you solve at least that problem as anyone who downloaded it can also checkout the source and compare your diff with it to see the changes.

[petert]

Here's another binary, this time I've checked-out origin/diaglvl, then made a local branch with git branch -b diaglvl. r18943, MSVC.

Disclaimer:
If diaglvl crashes, do not report it to the OpenTTD developers. Report it to this thread. When making your post about the crash, please upload the crash.dmp, crash.log, crash.sav, and crash.png (only available as of r18184, so if you are using a build older than that, don't bother). These files are vital to finding what happened during the crash. For developers, you can find the PDB file and other files at this site: http://users.tt-forums.net/petert/dev/

Peter

[fonso]

The repository and patch URLs have changed. See first post.