News:

Simutrans Forum Archive
A complete record of the old Simutrans Forum.

How to get a patchfile merged?

Started by Randy007, August 14, 2011, 10:18:03 AM

Previous topic - Next topic

0 Members and 1 Guest are viewing this topic.

Randy007

I tried to get the money.patch merged. money.patch is in folder-patches. Right click in tortoiseSVN apply patch opens the Merge-Window, but its empty. On open file i'll get fileselection Base file/Their file/My file. What to fill in?  ??? ???

Thanks for helping

Dwachs

yuo have to put the patch file in folder trunk/. Then tortoise SVN should recognze them.

Should this thread be moved to the German board ? To be able to continue in German ;)
Parsley, sage, rosemary, and maggikraut.

Randy007

Thats up to you  ;) But the int.community is bigger. maybe are more people interrested?! We can make a short discryption in german when we find the right way to do it.  ;D
I've done what you wrote, but i'll get th same result - an empty mergewindow

Dwachs

Tortoisesvn/merge does not know how to read that particular patch file  :P

You have to install a unix-like patch program like:

http://gnuwin32.sourceforge.net/packages/patch.htm

(I did not try to install this ...)
Parsley, sage, rosemary, and maggikraut.

Randy007

Thanks! 2007  ;D I looked with an Editor to the patch. In the moment its moore confuising to me  :D