How to make `hg diff` show whitespace changes?
Lester Caine
lester at lsces.co.uk
Thu Jan 14 16:47:01 UTC 2016
On 14/01/16 16:04, Matt Harbison wrote:
> I noticed it because of beyondcompare like I said, but it was "intermittent"
BeyondCompare is an essential part of my toolkit and is integrated into
Eclipse as well handling my two and three way merges. One trick I've
been using is to keep a separate active copy of the code to the 'repo'
version. Initially that was to replace the missing option to cherry pick
changes from the repo and merge them with my real local fork. Since BC
seems to change desktop style every time I update ( 4 and 4.1 are
different to one another :( ), I've also cherry picked it's updates and
I am sure there have been changes over time in the way IT maintains
working copies of the code especially when comparing to a zip archive
copy of a file, and file size when comparing between Linux and Windows
DOES seem to be somewhat intermittent.
The nice thing I find is the ability to switch on and off white space
and even comment differences, so you only see code changes, but this can
be a double edged sword when other contributors add substantial 'minor'
differences such as converting tabs to spaces and the like :(
--
Lester Caine - G8HFL
-----------------------------
Contact - http://lsces.co.uk/wiki/?page=contact
L.S.Caine Electronic Services - http://lsces.co.uk
EnquirySolve - http://enquirysolve.com/
Model Engineers Digital Workshop - http://medw.co.uk
Rainbow Digital Media - http://rainbowdigitalmedia.co.uk
More information about the Mercurial
mailing list