I've had issues in the past with special characters. Files that have had issues, we've converted using native2ascii which eliminates the problem you are seeing. However, it introduces a new one. You need to start thinking in UNICODE :-)
If that's a better option, I can easily convert everything using native2ascii. On Tue, Nov 29, 2011 at 5:18 PM, Andrew Petro <ape...@unicon.net> wrote: > Interesting. > > I see that this 'git add -p' is a way that I can apply more care to > composing my commits, and so I can stop suffering this mangled message > files problem. I'll apply this approach to clean up each of my two pending > pull requests that are mangled in this way. > > However, if CAS message files cannot be casually contributed to through > GitHub's web-based fork-edit-pull-request workflow, does that mean CAS is > doing something with regard to the encoding of these files that could be > done differently such that this approach to casual contribution can be > successful? > > It being difficult to successfully contribute to message bundles may be a > contributing factor to their in practice not being maintained. > > Andrew > > > > On 11/29/2011 5:02 PM, Daniel Frett wrote: > >> It appears that when your are editing the files locally, your editor >> keeps making decisions about how to format the files for you, which is what >> is leading to all the extraneous updates. >> >> One way to combat this is when adding files to the staging area before >> committing, use git add in interactive patch mode. >> >> git add -p [file] >> >> it will ask you whether you want to stage all changed hunks of the file >> individually, so you can make sure to be able to commit only what you want >> to commit. >> >> -Daniel >> >> On Nov 29, 2011, at 4:49 PM, Andrew Petro wrote: >> >> I created this pull request >>> >>> https://github.com/Jasig/cas/**pull/13/files<https://github.com/Jasig/cas/pull/13/files> >>> >>> through the GitHub web-based UI just now, and *it* mangled a bunch of >>> lines in that messages_fr.properties file. >>> >>> So, why is this so hard? Are other projects experiencing this much pain >>> trying to accept a single contributed message to a non-English message >>> file? >>> >>> This isn't just a whitespace issue. This is a file encoding issue? >>> >>> Andrew >>> >>> >>> On 11/29/2011 2:31 PM, Marvin Addison wrote: >>> >>>> Only a few of those files had a lot of lines changed. I'd guess that >>>>> they >>>>> had a different EOL than most, and you made them consistent. >>>>> >>>> I do hope we'll take on the task at some point to conform whitespace >>>> across the CAS codebase. While it may well be a holywar of tab vs >>>> space and CRLF versus LF, I think the consistency in the end will be >>>> worth the effort and will reduce the likelihood of issues like this. >>>> >>>> M >>>> >>>> >>> > > -- > You are currently subscribed to cas-dev@lists.jasig.org as: > scott.battag...@gmail.com > To unsubscribe, change settings or access archives, see > http://www.ja-sig.org/wiki/**display/JSG/cas-dev<http://www.ja-sig.org/wiki/display/JSG/cas-dev> > -- You are currently subscribed to cas-dev@lists.jasig.org as: arch...@mail-archive.com To unsubscribe, change settings or access archives, see http://www.ja-sig.org/wiki/display/JSG/cas-dev
