Issue #442 resolved

Shelve tool doesn't work with eol extension

Colin Caughie avatarColin Caughie created an issue

This is similar to issue 276, but happens specifically when you are using the eol extension to translate line endings. While 276 was apparently fixed in 2.0.1, this one is still a problem (and is actually worse because the only known workaround no longer works) in 2.0.2.

In my case we have a repository with LF line endings but use native line endings in the work area. I.e. the .hgeol file looks like this:

[patterns]
** = native

[repository]
native = LF

In this case unshelve (using thg) always fails. Adding "eol=auto" to mercurial.ini makes no difference in 2.0.2, although I'm pretty sure this fixed it in 2.0. (It shouldn't make a difference of course, since the eol extension automatically sets patch.eol=auto when it is loaded).

Comments (5)

  1. Log in to comment
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.