I overwrote a .tex file with another version of it. The version on disk is now exactly as i want it. Sourcetree is showing the file as altered, but not all alterations are shown, and some nonexistent alterations are shown. Additionally the line-numbering is off.
See attached Screenshot: (yellow highlighted regions)
I opened the file in Notepad++ to show the real content, and you can see in the background the Sourcetree diff, with wrong line numbering (observe that the real /begin->/end block is four lines from 40 to 43 and the Sourcetree diff is a weird /begin->/end/end block) and, very importantly: A line that does not exist anymore (Sourcetree line 36) is not marked as missing!
I tried commiting, the commit works with the real file, and also reverts fine, but the shown diff is always wrong. Altering stuff in N++ and saving resulted in a still wrong diff, that some times showed a +/- of lines that were unaltered and mostly showed the altered line (i experimented with the Windows 8 line ) as unaltered.
A diff using the diff tool from TortoiseGit was normal and correct.
Just to be clear: I doublechecked that N++ and Sourcetree are seeing the same file, by altering it in N++ and seeing the file change in Sourcetree - so this is not about looking at different files, this is some bug(?) in the ST-Diff (not the actual storing of files, just the showing of the differences)
Anybody know what causes this? It is very disconcerting to not be able to trust the diff.
Screenshot from Bitbucket, of older version of the file, with "Windows 8" line as part (?) of Line 33 ??
There seems to be an issue with CR as sole newline character, that (seemingly) won't get fixed: https://confluence.atlassian.com/sourcetreekb/diffs-do-not-render-correctly-due-to-an-old-style-mac-line-endings-265902596.html
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events