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

Re: svn commit: rev 6022 - in trunk: . subversion/clients/cmdline subversion/tests/clients/cmdline subversion/tests/clients/cmdline/getopt_tests_data tools/client-side

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-05-23 18:08:28 CEST

philip@tigris.org writes:

> Author: philip
> Date: Fri May 23 11:00:25 2003
> New Revision: 6022
> Modified:
> trunk/CHANGES
> trunk/subversion/clients/cmdline/cl.h
> trunk/subversion/clients/cmdline/diff-cmd.c
> trunk/subversion/clients/cmdline/main.c
> trunk/subversion/tests/clients/cmdline/diff_tests.py
> trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout
> trunk/tools/client-side/bash_completion
> Log:
> Issue 1142, change to 'svn diff [--old] [--new]' syntax.
> This is a new interface on the old backend, so with appropriate
> arguments, the diff output is unchanged. The new interface allows
> working copy to branch comparisons, some of these work but sometimes
> the backend will generate errors.

Now you can decide if the new diff syntax is acceptable (and if I have
understood the proposal). Every diff that used to work should have an
equivalent that produces the same output. Some of the new wc->branch
diffs work as well.

$ svn help diff
diff (di): display the differences between two paths.
usage: 1. diff [-r N[:M]] [--old OLD-TGT [--new NEW-TGT]] [PATH ...]
       2. diff -r N:M URL
       3. diff URL1[@N] URL2[@M]

  1. Display the differences between OLD-TGT and NEW-TGT. PATHs, if
     given, are relative to OLD-TGT and NEW-TGT and restrict the output
     to differences for those paths. OLD-TGT and NEW-TGT may be working
     copy paths or URL[@REV].

     OLD-TGT defaults to the path '.' and NEW-TGT defaults to OLD-TGT.
     N defaults to "BASE" or, if OLD-TGT is an URL, to "HEAD".
     M defaults to the current working version or, if NEW-TGT is an URL,
     to "HEAD".

     '-r N' sets the revision of OLD-TGT to N, '-r N:M' also sets the
     revision of NEW-TGT to M.

  2. Shorthand for 'svn diff -r N:M --old=URL --new=URL'.

  3. Shorthand for 'svn diff [-r N[:M]] --old=URL1 --new=URL2'

  Use just 'svn diff' to display local modifications in a working copy

Valid options:
  -r [--revision] arg : revision X or X:Y range. X or Y can be one of:
                             {DATE} date instead of revision number
                             "HEAD" latest in repository
                             "BASE" base revision of item's working copy
                             "COMMITTED" revision of item's last commit
                             "PREV" revision before item's last commit
  --old arg : use ARG as the older target
  --new arg : use ARG as the newer target
  -x [--extensions] arg : pass ARG as bundled options to GNU diff
  -N [--non-recursive] : operate on single directory only
  --diff-cmd arg : use ARG as diff command
  --no-diff-deleted : do not print differences for deleted files
  --ignore-ancestry : ignore ancestry when calculating differences
  --username arg : specify a username ARG
  --password arg : specify a password ARG
  --no-auth-cache : do not cache authentication tokens
  --non-interactive : do no interactive prompting

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 23 18:09:17 2003

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.