In the dev doc, the mercurial recommended config for Windows says that you should use the "win32 text" module.
But, this module prevent you to import some ".patch" files sometimes (I just pass 1 hour to understand why my patch file which seems to be a valid diff file can't be loaded...).
So, I recommend to use the "eol" module instead, which works perfectly, and it resolves the patch import issue. Updating the dev documentation part related to mercurial config should be done to encourage win users to use "eol" instead of "win32 text".
Update Dev doc Mercurial settings.
-
- Gremlin
- Posts: 193
- Joined: Fri Jan 25, 2008 6:55 pm
- Location: Nantes / France
- x 17
- masterfalcon
- OGRE Team Member
- Posts: 4270
- Joined: Sun Feb 25, 2007 4:56 am
- Location: Bloomington, MN
- x 126
- Contact:
Re: Update Dev doc Mercurial settings.
I can't recall exactly but which document is this in?
-
- Gremlin
- Posts: 193
- Joined: Fri Jan 25, 2008 6:55 pm
- Location: Nantes / France
- x 17
Re: Update Dev doc Mercurial settings.
Sorry , I was talking about this document, page "Windows specific"!
But hold on, finally I >may< have some issues with "eol", I'll need to check this first...
But hold on, finally I >may< have some issues with "eol", I'll need to check this first...
- masterfalcon
- OGRE Team Member
- Posts: 4270
- Joined: Sun Feb 25, 2007 4:56 am
- Location: Bloomington, MN
- x 126
- Contact:
Re: Update Dev doc Mercurial settings.
Ah ok. Would you mind filing a bug about this? Hopefully we can take care of it ASAP.
-
- Gremlin
- Posts: 193
- Joined: Fri Jan 25, 2008 6:55 pm
- Location: Nantes / France
- x 17
Re: Update Dev doc Mercurial settings.
Hi, finally, I think that "eol" option is ok, I should have clicked on "uniformise line ending" in VS by mistake.
-
- Minaton
- Posts: 933
- Joined: Mon Mar 05, 2012 11:37 am
- Location: Germany
- x 110
Re: Update Dev doc Mercurial settings.
Switching to eol is a good idea, because:
http://mercurial.selenic.com/wiki/Win32TextExtensionDeprecation: The win32text extension requires each user to configure the extension again and again for each clone since the configuration is not copied when cloning.
We have therefore made the EolExtension as an alternative. The EolExtension uses a version controlled file for its configuration and each clone will therefore use the right settings from the start.
This extension may be removed in a future release of Mercurial.
-
- Gremlin
- Posts: 193
- Joined: Fri Jan 25, 2008 6:55 pm
- Location: Nantes / France
- x 17
Re: Update Dev doc Mercurial settings.
Yes, and as noticed in the link provided by Transporter, patching is a mess with win32text:
Patch operations
Operations that apply patches, e.g. hg import and hg qpush, do not honor the win32text filters; a different method is required to make these work. Mercurial can be told to ignore line endings when patching using the patch.eol configuration option; see below for an example.
Without this option you will see a lot of error messages like this:Code: Select all
patching file path/to/file Hunk #1 FAILED at 0 1 out of 1 hunks FAILED -- saving rejects to file path/to/file.rej