Howto apply a patch/diff file

[Ben1338]

What's a HD? What about the desktop?

[athanasios]

. . .
-"Harley Davidson?"

[Ben1338]

thanks for the original reply.

And thanks to the rest of the people who helped me.

[Firestar]

I don't know if this is the correct place to be asking this, but have being trying to apply a patch, now as buildottd does not work anymore, but it does install mingw32, I have compliled with it, for a number of days, but when i try to patch I get this.
sh: /bin/patch: Permission denied
I'm using vista, and tryed running patch with admin access, any idea on how to fix this problem

Thanks

[DaleStan]

Code: Select all

$ ls -l /bin/patch*

[Hamilton2007]

I think i can handle the patching stuff now. Only are all of the patching files in red. I'm trying the map-1M-13664-fixed patch.

[Hamilton2007]

Why are their note of exclamations in my SVN map ?

Lang, genworld_gui, train_cmd, map and map_type have all a red note of exclamation, all the rest is green???

If i try update SVN, they stay in red.

[Alberth]

Why are their note of exclamations in my SVN map ?

Lang, genworld_gui, train_cmd, map and map_type have all a red note of exclamation, all the rest is green???

If i try update SVN, they stay in red.

No idea what you are using, but a wild guess:

You are trying to merge a recent trunk (in the order of revision 16xxx) with an old patch of revision 13xxx, and you have merge conflicts (what is the state of the 'red' files?) since a lot happens in 3000 changes.

To resolve the conflicts, you'll have to investigate, and decide how the change should be merged. Once that is done, denote to svn that you have resolved the conflict.
The olny other alternative is to revert the patch.

[Hamilton2007]

Ok i revert the SVN map now and they are all green now.

[Hamilton2007]

If i right click SVN map and choose applay patch, then choose my patch, then i get the merge window but some of the patch files are in red, what does this mean?

example i'm trying the map-1M-13664-fixed patch.

settings.cpp
english.txt
train_cmd.cpp
openttd.cpp are all red.

genworld_gui.cpp
saveload.cpp
map_type.h
map.cpp are all black

[Alberth]

Repeating your question does not work.

Try reading the manual of your SVN program (there are many, and not every body uses the same one).

[Hamilton2007]

I'm using TortoiseSVN and theire is no manuel in it.

[Thief^]

Really?

I think, the red entries in the merge files list mean that the trunk version of that file has changed since the patch was made. It's not a problem unless it gives you errors about conflicts when you try to merge.

The red icons on files after patching mean that you have changes to those files compared to trunk. If you've just applied a patch, you want that. What you don't want is yellow "warning sign"-type triangles, which indicate a problem.

[Rubidium]

The developers of TortoiseSVN[0] seem to disagree with you: [quote=TortoiseSVN]If you have TortoiseSVN installed, you can simply press the F1 key in any dialog to start up the help.[/quote]

[0] http://tortoisesvn.net/support <- also contains PDF versions of the manual (in several languages)

[Thief^]

Beat you to it Rubi!

[Hamilton2007]

Yeah found it

But it isn't really simple in my opinion

[DaleStan]

Indeed. Many people have problems with reading. But please don't foist those problems on us. Find your friendly local reading teacher, and ask him or her in person.

[Hamilton2007]

I'm just asking right

I'm asking here because here are the pro's with experience on the program.

But i gave up, the translation from the program to dutch is really bad in my opinion.

[DaleStan]

"Professional" means "I get paid to do this".

I do not get paid to do this, ergo I am not a professional. As far as I know, everyone else on these forums is in the same boat. You are welcome to arrange a change in that status.

And the apo'strophe doe's not mean "Look out! Here come's an 'S'!"

[orcaz]

I get this error (using cygwin)