You need Git or HG for that.
As a workaround ...
-Pull diff from modified patchpack.
-Compare original and modified patchpack.diff in file comparison program while applying only the difference to clean trunk. (Manually.)
-Pull diff.
-Done.
Stupid questions about patching
Moderator: OpenTTD Developers
Re: Stupid questions about patching
-- .- -.-- / - .... . / ..-. --- .-. -.-. . / -... . / .-- .. - .... / -.-- --- ..- .-.-.-
--- .... / -.-- . .- .... --..-- / .- -. -.. / .--. .-. .- .. ... . / - .... . / .-.. --- .-. -.. / ..-. --- .-. / .... . / --. .- ...- . / ..- ... / -.-. .... --- --- -.-. .... --- --- ... .-.-.- / ---... .--.
Playing with my patchpack? Ask questions on usage and report bugs in the correct thread first, please.
All included patches have been modified and are no longer 100% original.
--- .... / -.-- . .- .... --..-- / .- -. -.. / .--. .-. .- .. ... . / - .... . / .-.. --- .-. -.. / ..-. --- .-. / .... . / --. .- ...- . / ..- ... / -.-. .... --- --- -.-. .... --- --- ... .-.-.- / ---... .--.
Playing with my patchpack? Ask questions on usage and report bugs in the correct thread first, please.
All included patches have been modified and are no longer 100% original.
Re: Stupid questions about patching
If you have a diff program, you can get a diff from two directories.
However, it is in the somewhat longer run probably better to get HG, and learn how to use its patch queue (mq).
However, it is in the somewhat longer run probably better to get HG, and learn how to use its patch queue (mq).
Re: Stupid questions about patching
Sounds like a task for hg queues. But any version control system would probably do.
My OpenTTD contributions (AIs, Game Scripts, patches, OpenTTD Auto Updater, and some sprites)
Junctioneer (a traffic intersection simulator)
Junctioneer (a traffic intersection simulator)
Who is online
Users browsing this forum: No registered users and 9 guests