[EMAIL PROTECTED] wrote: > Hi Peter, > >> I have some source files in an hg repository with unix newlines, >> checked out onto a windows PC. My editor doesn't really care, >> so I have no problems editing the file. >> <snip> >> I figured that the merge had botched my line endings (converted >> all my unix newlines to windows newlines), so i did a dos2unix >> on the source file and hit refresh on the hgtk commit dialog (qct). > > FWIW I'm in a similar situation (working on windows collaborating on a mostly > unix newlined repo) having recently switched to mercurial, and so face the > same problem after any interactive merge. > > I've taken to using an emacs macro (our editor of choice) to just de-dosify > any previously unix files post-merge (and I'd automate this as a post-merge > script if that ever became too tedious.) > > Alternatively, if anyone can recommend a usable interactive merge tool that > *preserves* the input file line endings (neither gpyfm or kdiff3 can be > convinced to, afaics), it would be great to see that packaged with Tortoisehg.
kdiff3 appears to have an option to set the line ending to UNIX, but the option is global - I couldn't see an option to 'preserve' line endings (which might be slightly tricky for it to do if merging two files using different line endings). Tom ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
