水银+ MQ EOL 行为
我正在 Win+OSX 上使用 Mercurial+mq,EOL 问题快要了我的命。 我已经激活了 EOL 扩展,添加了 .hgeol ,如下所示:
[patterns]
**.sln = CRLF
**.vcproj = CRLF
**.vcxproj = CRLF
**.vcproj.filters = CRLF
**.vcxproj.filters = CRLF
**autoexp.dat = CRLF
**Makefile = LF
** = native
并且一切似乎都工作正常..在 Windows 上(好吧,我有一些文件存在行结尾问题,我在第一个补丁中修复了它们,即包含 .hgeol 的补丁)。也有hgeol)。
然后我转向 Mac,假设它也能在那里工作,对吧?嗯,错了。当我 qpush 第一个补丁(带有“.hgeol”文件 + 行结束更改的补丁)时,它可以工作,但我看到一组“修改”文件(它与我在 Windows 上“修复”的文件完全相同,这样它们就不再显示为修改过的!)。不管怎样,我尝试“hg qrefresh”以获得行更改(以为我稍后会弄清楚)...但没有运气:如果我继续 qpush 我的其他补丁,我会开始收到拒绝:(
知道如何解决这个问题/是什么原因造成的吗?这让我发疯......
I'm working with mercurial+mq, on Win+OSX, and the EOL issues are killing me.
I've activated EOL extension, added .hgeol as shown below:
[patterns]
**.sln = CRLF
**.vcproj = CRLF
**.vcxproj = CRLF
**.vcproj.filters = CRLF
**.vcxproj.filters = CRLF
**autoexp.dat = CRLF
**Makefile = LF
** = native
and everything seemed to work fine .. on Windows (well, I had a few files with line ending issues, I fixed them in the first patch, the one that includes .hgeol too).
Then I moved to Mac, assuming it would work there too, right? Well, wrong. When I qpush the first patch (the one with the ".hgeol" file + the line-ending changes), it works but I see a set of "modified" files (it's the exact same files that I "fixed" on windows, so that they no longer show as modified!). Whatever, I try to "hg qrefresh" in order to get the line changes (thinking I'll figure it out later)... but no luck: how if I go on to qpush my other patches, I start geting rejects :(
Any idea how to fix this/what is causing it? It's driving me crazy....
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
我们同意编译器知道如何处理任何新的行格式,甚至是混合格式。
因此,我的建议是:
.sln
、.vcproj
等),按照您已经进行的设置所有现有补丁也应遵守该更改
a.您可能需要一一应用它们,并再次清理文件并刷新这些补丁,以便换行符也得到修复
在此之后,您应该很好只要:
希望这会有所帮助;)
问候。
Let's agree that the compilers know how to deal with any new line format and even a mix.
So, my suggestion would be:
.sln
,.vcproj
, etc.) to be set up as you already didAll your existing patches should also adhere that
a. you may need to apply them one by one, and clean up the files again and refresh those patches so the newlines are also fixed
After this you should be good as long as you:
Hope this helps ;)
Regards.