You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Vincent Lefevre <vi...@vinc17.org> on 2004/08/20 23:40:09 UTC
svn diff --diff-cmd and unknown diff options
The diff command used in svn diff --diff-cmd doesn't necessarily have
the same options as GNU diff. When using svn diff --diff-cmd docdiff,
I got:
Index: contents/research/extended.en.xml
===================================================================
docdiff: ambiguous option: -L
There should be an option to remove the options normally used by
Subversion.
Note: I'm using svn, version 1.0.5 (r9954).
--
Vincent Lefèvre <vi...@vinc17.org> - Web: <http://www.vinc17.org/>
100% validated (X)HTML - Acorn / RISC OS / ARM, free software, YP17,
Championnat International des Jeux Mathématiques et Logiques, etc.
Work: CR INRIA - computer arithmetic / SPACES project at LORIA
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn diff --diff-cmd and unknown diff options
Posted by Eric Gillespie <ep...@pretzelnet.org>.
Greg Hudson <gh...@MIT.EDU> writes:
> The real catch is that we pass -L options to set the labels used by the
> diff.
Yeah, i was digging in to send a patch and noticed this. Oh
well.
--
Eric Gillespie <*> epg@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn diff --diff-cmd and unknown diff options
Posted by Greg Hudson <gh...@MIT.EDU>.
On Sat, 2004-08-21 at 11:27, Eric Gillespie wrote:
> Seriously, the only reason we pass these options is due to
> hysterical raisins, right?.
The real catch is that we pass -L options to set the labels used by the
diff.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn diff --diff-cmd and unknown diff options
Posted by Eric Gillespie <ep...@pretzelnet.org>.
"C. Michael Pilato" <cm...@collab.net> writes:
> Actually, we recommend that folk just wrap their diff commands with a
> script that can ignore the options that don't make sense for that diff
> tool.
Hah, we recommend that people just work around the problem? How
nice :).
Seriously, the only reason we pass these options is due to
hysterical raisins, right?. Specifically, before we had internal
diff, everyone agreed that the right thing to do would be to
default to unified diff format. But, IMHO, once we got the
internal diff that would always use that format, we should have
lost the automatically passed options to diff, or at least let -x
override rather than append to them.
--
Eric Gillespie <*> epg@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn diff --diff-cmd and unknown diff options
Posted by "C. Michael Pilato" <cm...@collab.net>.
Vincent Lefevre <vi...@vinc17.org> writes:
> The diff command used in svn diff --diff-cmd doesn't necessarily have
> the same options as GNU diff. When using svn diff --diff-cmd docdiff,
> I got:
>
> Index: contents/research/extended.en.xml
> ===================================================================
> docdiff: ambiguous option: -L
>
> There should be an option to remove the options normally used by
> Subversion.
Actually, we recommend that folk just wrap their diff commands with a
script that can ignore the options that don't make sense for that diff
tool. I'll note here, though, that it was brought to my attention
just today that we don't appear to document anywhere what that list of
options is, which makes it kinda hard for folks to know what to expect
(and therefore, what to use/ignore).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org