On Mon, Feb 06, 2012 at 11:26:16PM -0500, Richard Hipp wrote: > A lot of people have been telling me that they prefer the "unified" or > "context" style in-line diffs over side-by-side diffs. And I have to admit > that sometimes an in-line diff is easier to read and understand. But > side-by-side diffs, especially with the recent enhancements, sometime give > a much clearer picture of what changed. The following is a dramatic > example of this that I stumbled over while testing. First the in-line > diff: > > > > http://www.fossil-scm.org/fossil/fdiff?v1=25b66bf2fcb&v2=1a6be6bad57&sbs=0#chunk3 > > Can you tell what changed? Now look at the side-by-side diff: > > > > http://www.fossil-scm.org/fossil/fdiff?v1=25b66bf2fcb&v2=1a6be6bad57&sbs=1#chunk3 > > Surely you will admit that, in this case at least, the side-by-side diff > gives a much clearer picture of what happened.... > -- > D. Richard Hipp > d...@sqlite.org
For sure, unified diff is very poor in that particular exemple. Unified or context diff will work well when single lines (or small block of lines) with change in them, where you have the 2 lines one next to the other. But with the improvement done on the sbsdiff version, I start to like sbsdiff a lot more. One case where I will switch to unified mode is when comparing long lines, since sbsdiff trunk them. A usefull option for sbsdiff would be to have an option to ignore white spaces (vertical and horizontal). Sometimes, this help for files with very messy changes done by a too smart editor or if someone do some changes in the same commit he convert tabs to spaces. Good Job.. -- Martin G. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
