On Mon 19-Nov-2012 at 20:40 -0400, Jim Watters wrote:

When I try and do a compare locally on the two branches I get a bunch of files showing up different. I believe this has to do with the way the line returns get converted on Windows machine. because when I do a character based compare all is the same.

I believe there needs a modification to the .hgeol file. currently **.c and **.cpp are marked native.
**.c = native
**.cpp = native

This should be ok, you want to see these files as CRLF on your Windows machine even while Linux mercurial users see them as LF.

The files in any released tarballs will all be LF, are you sure you don't have a mixture of files from mercurial and files from other sources?

--
Bruno

--
You received this message because you are subscribed to the Google Groups "Hugin and 
other free panoramic software" group.
A list of frequently asked questions is available at: 
http://wiki.panotools.org/Hugin_FAQ
To post to this group, send email to hugin-ptx@googlegroups.com
To unsubscribe from this group, send email to 
hugin-ptx+unsubscr...@googlegroups.com
For more options, visit this group at http://groups.google.com/group/hugin-ptx

Reply via email to