shelve/unshelve problem with "No newline at end of file"
Created originally on Bitbucket by Anonymous
I have a problem doing this
- I have a file without a new line at the end of the file. This is the end of the file:
{{{ Last line of the file (no new line after this line). }}}
-
I add new content at the end of the file without adding a new line at the end of the file.
-
I shelve the last change. I obtain the following shelve:
{{{ -Last line of the file (no new line after this line). \ No newline at end of file +Last line of the file (no new line after this line). + +Line added without new line after this. \ No newline at end of file }}}
- I add a new line at the end of the file and the commit this change obtaining the following commit message:
{{{ -Last line of the file (no new line after this line). \ No newline at end of file +Last line of the file (no new line after this line). }}}
- I try to unshelve but my shelved changes are rejected! This is the content of the .rej file:
{{{ --- FLOWTIAux.ci +++ FLOWTIAux.ci @@ -339,4 +339,6 @@ fr_calc_L_VEM_m(iLine) calc_qvxday_31(miFCLine)) */
-Last line of the file (no new line after this line). \ No newline at end of file +Last line of the file (no new line after this line). + +Line added without new line after this. \ No newline at end of file }}}
I think it's a problem related to the presence of a new line at the end of the file added after the shelve command. Thanks