On Thu, Mar 10, 2011 at 11:19:08AM +0100, Nautile Bleu wrote: > Hi, > > Chamilo has a quite consistent coding standard but I found that lots of > files mix Windows and Unix EOL. > > My experience taught me that it can leads to merge/diff problems with > Mercurial.
Yes, I've been having trouble with that too with ediff under Emacs, and I've been told vimdiff has the same problem. > The Python project uses an Hg extension to force (in fact convert) EOL > on commit: > > [1]http://www.python.org/dev/peps/pep-0385/#end-of-line-conversions > > Maybe we should add this extension to the default toolkit? A great idea. However, AFAIK this requires people to have the eol extension enabled in their .hgrc; it cannot be forced from the repo. It's a good idea to put a HACKING or CONTRIBUTING file in the core repo root directory, which discusses these things. It should be easy for people to discover what formatting rules to follow when they want to commit. > On the other side, I don't think bitbucket allows us to block changeset > with inconsistent EOL like suggested in the PEP. That's too bad :( Regards, Peter Bex Case Builders - http://www.case-builders.com _______________________________________________ Dev mailing list [email protected] http://lists.chamilo.org/listinfo/dev
