Fix deboosting #1318
Fix deboosting #1318
Conversation
|
What's this formatting 'fix' for? Aside from being unnecessary, I think 99% of our code uses Allman style brackets not K&R style. |
|
:( |
|
@scrawl Hopefully better? fallback.cpp had some sloppy (no style) formatting that I cleaned up as well. |
|
No, I don't think there should be any cleanup at all. That's just asking for trouble for no reason (conflicts) if someone else wants to edit the same file. |
|
I can understand avoiding cleanup on files that are frequently worked on, but according to fallback.cpp's history the last time it was worked on outside of psi29a's current work was over a year ago, so it doesn't really seem like a problem to me... Edit: I can understand not wanting to set a precedent. I just don't want psi29a to feel discouraged from continuing his work. |
|
Well, on the other hand, I guess you can never predict when someone would want to edit the file... and since it's being worked on now, it might be more likely than usual that someone would want to... Well, never mind me. |
|
@scrawl I thought we agreed that we never 'cleanup for sake of cleaning up' unless we are editing the file in question to fix something. In this case, fallback.cpp needed some love (Allman style like you suggested). I don't see any PR that touches the file in question so there shouldn't be any conflicts. Would you rather I do this in another PR? (Thought this seems to go against what we talked about.) |
|
I think formatting should be limited to and around lines that you were already changing anyway; changing one line doesn't justify giving the whole file a makeover. Fewer changes = less risk of conflict.
I suppose in this case (file is old and self contained) the risk seems low, but still we shouldn't go around assuming such things. Someone may be working on a PR they haven't submitted yet or have something in their stash. Then we have two forks already (tes3mp and the oblivion one) who the hell knows what they might have changed; and just because there aren't changes now doesn't mean there won't be any in the future (from users still on old code for whatever reason).
You could turn that around and ask, if a file is no longer worked on and forgotten then why is the 'bad' formatting even an issue? |
|
I see your point about tes3mp, I made a revert commit. :) |
|
Great, now just rebase it and I'll be happy. You can merge yourself then. |
…period in french localization, using std::replace is not a solution, going back to boost::lexical_cast
…rything and fixed up formatting use Allman style brackets not K&R style, additional formatting for fallback.cpp which needed some love revert allman formatting changes
|
done and done, i'll wait for last round of ci |
Fixed 3 things that @scrawl mentioned here: #1314