subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Hsu <ben....@bluefly.com>
Subject Re: svn diff -x --unified
Date Fri, 01 Apr 2011 21:32:21 GMT
Hi Sam,

does this work for you?

svn  diff --diff-cmd=/usr/bin/diff -x --unified=3


On Fri, Apr 1, 2011 at 10:15 AM, Sam Steingold <sds@gnu.org> wrote:

> How do I supply the number of context lines for unified diff?
>
> $ svn diff --help
> seems to imply that "svn diff -x --unified" is what I need.
> However, there seems to be no way to pass "--unified=1" to the external
> diff program:
>
> $ svn di -x '--unified 1' my-file-name
> svn: Invalid argument '1' in diff options
> $ svn di -x --unified 1 my-file-name
> svn: '1' is not under version control
> $ svn di -x --unified -x 1 my-file-name
> svn: Invalid argument '1' in diff options
> $ svn di -x --unified=1 my-file-name
> svn: Error parsing diff options: Missing parameter for the specified
> command line option
> $ svn di -x --unified 1 my-file-name
> svn: '1' is not under version control
> $ svn di -x -u1 my-file-name
> svn: Error parsing diff options: Bad character specified on command line
>
> thanks!
> --
> Sam Steingold (http://sds.podval.org/) on CentOS release 5.5 (Final) X
> http://iris.org.il http://honestreporting.com http://jihadwatch.org
> http://thereligionofpeace.com http://mideasttruth.com
> http://www.memritv.org
> Don't ascribe to malice what can be adequately explained by stupidity.
>

Mime
View raw message