This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Patch Submission Policy [Doc Patch]


On Sat, Feb 23, 2008 at 11:30 AM, Manuel LÃpez-IbÃÃez
<lopezibanez@gmail.com> wrote:
> On 23/02/2008, Tom Browder <tom.browder@gmail.com> wrote:
>  >
>  >  Note that the "-c3p" option generates a diff error: "diff: `-3' option
>  >  is obsolete; omit it"
>
>  It seems a very recent change...
>
>  You can still use "diff -c 3 -p". But 3 is the default, so I agree
>  that diff -up and diff -cp should be fine.
>

The options/extern diff I use for diff are from
http://gcc.gnu.org/wiki/SvnTricks :
diff=/usr/bin/diff

# Additional -F for .md files
extra_args="-F^(define"

# Do not pass multiple -c/-u options
case "$1" in
  -c*|-C*) exec ${diff} -p ${extra_args} "$@" ;;
  -u*|-U*) exec ${diff} -p ${extra_args} "$@" ;;
  *) exec ${diff} -up ${extra_args} "$@" ;;
esac

This gives a good -p for even .md files.


-- Pinski

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]