Print Page - How to get a patchfile merged?

Title: How to get a patchfile merged?
Post by: Randy007 on August 14, 2011, 10:18:03 AM

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

Title: Re: How to get a patchfile merged?
Post by: Dwachs on August 14, 2011, 10:48:40 AM

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 ;)

Title: Re: How to get a patchfile merged?
Post by: Randy007 on August 14, 2011, 11:17:25 AM

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

Title: Re: How to get a patchfile merged?
Post by: Dwachs on August 14, 2011, 04:08:10 PM

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 ...)

Title: Re: How to get a patchfile merged?
Post by: Randy007 on August 14, 2011, 04:30:16 PM

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

The International Simutrans Forum

Development => Technical Documentation => Topic started by: Randy007 on August 14, 2011, 10:18:03 AM