How can I ignore eol changes and all white space in svn?

前端 未结 2 1255
太阳男子
太阳男子 2021-02-01 02:15

Combining svn diff --ignore-eol-style and --ignore-all-space is not working:

$ svn diff -x -w --ignore-eol-style -r 1143:1177 somefile
svn: invalid option: --ign         


        
相关标签:
2条回答
  • 2021-02-01 02:48

    The svn command seems to honour only one -x option. This means, you must/can combine all options into one argument:

        svn diff -x "-w --ignore-eol-style"
    

    I did not test whether this is also true for external diff-tools.

    0 讨论(0)
  • 2021-02-01 02:56

    You can use external differencing tool with appropriate options (diff-cmd option in SVN config). Check this. Then you have freedom to set any diff tool and provide arguments to it. You can also use it directly:

    svn diff --diff-cmd /usr/bin/diff --extensions "-b" -r 1143:1177 somefile
    

    where -b to ignore white space at line end and consider all other sequences of one or more white space characters to be equivalent,

    0 讨论(0)
提交回复
热议问题