[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] diff label problems

From: Rafael Garcia-Suarez <rgarciasuarez_at_free.fr>
Date: 2002-10-19 21:25:57 CEST

Philip Martin wrote:
> Gustavo Niemeyer <niemeyer@conectiva.com> writes:
>
> > This small patch fixes this behavior:
>
> Looks good. Does it work with 2.8 GNU diff? I have 2.7 installed and
> it works with that, but there are differences in the command line
> between 2.7 and 2.8.

The -L option is deprecated with diff 2.8, in favor of the long
form "--label". I suggest updating this patch accordingly (replacing
"-L" by "--label").

> > * subversion/libsvn_subr/io.c
> > (svn_io_run_diff): Repeat -L option, forcing usage of label for
> > both files.
> >
> > Index: subversion/libsvn_subr/io.c
> > ===================================================================
> > --- subversion/libsvn_subr/io.c
> > +++ subversion/libsvn_subr/io.c 2002-10-18 21:01:11.000000000 -0300
> > @@ -1401,7 +1401,7 @@
> > nargs += 1; /* -u */
> >
> > if (label != NULL)
> > - nargs += 2; /* the -L and the label itself */
> > + nargs += 4; /* the -L and the label itself, two times */
> >
> > args = apr_palloc (subpool, nargs * sizeof(char *));
> >
> > @@ -1421,6 +1421,8 @@
> > {
> > args[i++] = "-L";
> > args[i++] = label;
> > + args[i++] = "-L";
> > + args[i++] = label;
> > }
> >
> > args[i++] = from;

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 19 21:20:33 2002

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.