Bart Robinson <>


r858642 | julianfoad | 2006-02-23 00:04:20 +0000 (Thu, 23 Feb 2006)

Extend -c/--change option in diff and merge to accept negative revisions
as meaning the reverse of a change, making it possible to back out changes
with -c rather than -r.  E.g., -c -1234 is the same as -r1234:1233.

Patch by: Bart Robinson <>

* subversion/svn/main.c
  (svn_cl__options): Update docstring for '--change'.
  (svn_cl__cmd_table): Update 'diff' and 'merge' docstrings.
  (main): Handle parsing for negative revision number.

* subversion/tests/cmdline/
  (diff_only_property_change): Add checks for '-c' with negative and
    positive args.

* subversion/tests/cmdline/
  (merge_one_file, merge_with_implicit_target): Rename to '*_helper'.
    Add an argument to indicate whether to use '-r' or '-c'.
  (merge_one_file_using_r): New.
  (merge_one_file_using_c): New.
  (merge_one_file_with_c): Replace with 'merge_one_file_using_c' stub.
  (merge_with_implicit_target_using_r): New.
  (merge_with_implicit_target_using_c): New.
  (test_list): Add the new tests.