shelve : change editor does not work when EOL of target file is CRLF.

[IWATA Hidetaka]

I have a file in my working tree, eol of which is CRLF.

I can't shelve changes of this file by change editor.
bzr always says 'No changes to shelve' after editing file, regardless of how I edit it.

VERSION INFO:
Bazaar (bzr) 2.4b1
  Python interpreter: C:\DEVELOP\py_envs\bzr2.4\Scripts\python.exe 2.6.6
  Python standard library: C:\DEVELOP\py_envs\bzr2.4\lib
  Platform: Windows-7-6.1.7600
  bzrlib: C:\DEVELOP\py_envs\bzr2.4\lib\site-packages\bzrlib
  Bazaar configuration: C:\Users\iwata\AppData\Roaming\bazaar\2.0
  Bazaar log file: C:\Users\iwata\Documents\.bzr.log

[IWATA Hidetaka (hid-iwata)]

It seems that this comes from two reasons.

First one is in bzrlib.diff.DiffFromTool.edit_file.
This method returns LF ended lines always, even if original data are CRLF ended lines.

Second is in bzrlib.shelf_ui.Shelver._count_changed_regions.
This method returns wrong value when first or last line are changed.