Print

Please login or register.
1 Hour 1 Day 1 Week 1 Month Forever
Login with username, password and session length

[Eldin00]

I'm just wondering what tools or techniques everyone uses to migrate their changes to the raws to a new version of DF? Just copying the changes over by hand is ok when you only have a few changes, but as the number of changes grows, it becomes increasingly tedious to do that way. So I'm looking for suggestions from those who have worked with far more substantial mods than anything I've tried yet.

[scamtank]

WinMerge lets you export the differences it detects between two sets of files (say, vanilla raws and Phoebus-imbued raws) into a "recipe" that GNU utilities can understand and then automatically apply.

Or if you don't have one of those handy, manually doing that shit in WinMerge needs three keys. Alt+Down to skip down to the next detected discrepancy, Alt-Right to copy it across.

[Vattic]

Can't agree more about WinMerge. I migrate a load of personal changes between versions.

[Naryar]

this thread is relevant to my interests.

I'm probably going to go from .40.16 to .40.19 in a while. And I am, as usual, modding the game to my tastes.

[Knight Otu]

On Linux, I'm using meld for the most part. I also wrote a python script meant as an options script, but which also helps with the repetitive/predictable mass of changes to the raws I make in my mod(s), such as changing hoof type.

[Eldin00]

Thanks to all who gave suggestions. I'll definitely give WinMerge a try the next time I try moving my changes to a new release.

[fricy]

On Linux, I'm using meld for the most part. I also wrote a python script meant as an options script, but which also helps with the repetitive/predictable mass of changes to the raws I make in my mod(s), such as changing hoof type.

Can you post the script somewhere? So far I've used kdiff3, but that doesn't do scripts. Regex I assume?

[Knight Otu]

I might be misreading your meaning, but the python script is independent of any diff utility. Also, I'm not quite sure about my code - it does what it is supposed to do, but I'm not convinced that it is the best way that python can do it. But yes, regexes are involved at some points.

[zilpin]

WinMerge is a great intro easy merge tool, good to learn on.  Start there.

TortoiseSVN and TortoiseGit both have good free merge tools, relatively easy to use.  A decent alternative to WinMerge.

Once you're comfortable with those, KDiff3 is far more capable, and can do a Triple-Diff, which gets best results.

Spoiler (click to show/hide)

This is my preferred tool.  This means you get better results, because you can tell it the original vanilla raw folder where both began, then compare your changes and the new raw folder's changes, where it combines them knowing who changed what and how.

And all of these are meant to compare any text file, so concerns about "cant do script" or "cant do *.txt files" are misinformed.
They'll all do just fine with DF's raw.txt files.

[Knight Otu]

And all of these are meant to compare any text file, so concerns about "cant do script" or "cant do *.txt files" are misinformed.
They'll all do just fine with DF's raw.txt files.

Was anyone concerned about that?