search

pjf / masterwork-dwarf-fortress

Patches and bugfixes applied to Meph's amazing Masterwork Dwarf Fortress
33 stars 22 forks source link

Check 4i import for regressions #143

Closed pjf closed 10 years ago

pjf commented 10 years ago

There's discussion of this in #130. In particular, soapmaking changes have been lost.

a7c837824540afa7a0336b484b633132de0ba53c is the commit in question.

pjf commented 10 years ago

I think I've managed to catch everything, but unfortunately as a manual process there could be regressions that I've missed.

@splintermind : I don't suppose you happen to have original, separate commits for the 4i integration and the rest of the changes in a7c8378, do you? All the regressions are almost certainly caused by the 4i integration, and since we already do that in 1201f5e373c047daee04ea4a596d2cbc03ffa78b, factoring those out would make me feel much better to ensure we don't still have any regressions that I've missed.

In any case, this is a great demonstration why individual, independent commits for each change are so awesome.

It's also a really good demonstration of why I should have the "integrate a new release of Masterwork" process documented. It's almost completely scripted, and because it generates pretty tight changesets we almost never see regressions to SWP changes. I should make sure that yourself or someone else can reproduce this, for when I get hit by a bus, or go on yet another speaking tour. :)

Regardless, you are totally awesome, and you do awesome things. Thank you! <3

PaulMaynard commented 10 years ago

I've fixed them on my branch, you should just be able to pull, right?

splintermind commented 10 years ago

No unfortunately I made all those changes in one motivated burst, but I won't be doing that again! I think where I went wrong was assuming that the 4i was based on the most recent SWP and that everything different was intentional changes.

Your integrations of Meph's work so far have been much more successful, so yes, an explanation of how you apply them would be very helpful, if you don't mind. My apologies for the extra work I inadvertently created.

pjf commented 10 years ago

@ppeng : I should, and hope to do so once I get out of business hours. Running a business takes up so much time!

@splintermind : Shall do! Have opened a ticket to track.

Also, no apologies! You're totally awesome and do great work! <3