I noticed something interesting today.
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.
Anyway, I wanted to take the changes from the remote repository on the file
that I had been working on, so i did an "hg up" and got the graphical merge
too.
After I finished merging and saving my changes, hgtk commit showed the
changeset as a _deletion and reinsertion of the entire file_.
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). Sure enough, this fixed the
problem and my local changes appeared normal. I worry, however, that not
everyone would know to do that.
So, should I file this as a bug against thg or hg or windows or is this
already fixed?
Thanks,
--
Peter
-------------------------------------------------------------------------
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
