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

Re: Add -c option to merge

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2005-10-27 15:05:40 CEST

Daniel Berlin wrote:
> On Thu, 2005-10-27 at 11:52 +0100, Julian Foad wrote:
>>This review is a picky one. All of these comments are about the help text; I
>>didn't find any other problems this time (but I know there are ongoing
>>discussions about negative changes).
> I fixed all of these before the commit, except for NUMBER-1:NUMBER, and
> "specify" :). I will fix the typos momentarily.

Oh, you've committed it already. Not one to hang around, are you? :-)

> r17054 | dberlin | 2005-10-27 00:42:52 +0100 (Thu, 27 Oct 2005) | 14 lines
> Add a -c option to merge and diff.

Please describe here what feature has been added, not just what option letter
is used to invoke it.

> * subversion/clients/cmdline/main.c
> (svn_cl__options): Add 'c'/'change' option.
> (svn_cl__cmd_tables): Merge and diff can take 'c' argument.

The name of this array is "svn_cl__cmd_table".

> (main): Handle parsing for 'c'.
> * subversion/tests/client/cmdline/diff_tests.py: Modify one
> test to also use -c.
> * subversion/tests/client/cmdline/merge_tests.py: Add copy
> of test to test -c.

Please name the test functions. Here's an example from an earlier log message

* subversion/tests/clients/cmdline/switch_tests.py
   (relocate_beyond_repos_root): New test.
   (test_list): Run it.

> {"change", 'c', 1, N_("Shorthand for the revision range NUMBER-1:NUMBER")},

The descriptions generally start with a lower-case letter, so this one should too.

> " 3. merge [-c M |-r N:M] SOURCE[@REV] [WCPATH]\n"

Missing space after "|" :-)

> else if (opt_state.end_revision.value.number == 0)
> {
> err = svn_error_create (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
> _("There is no change 0"));

Somebody pointed out that it should trap numbers less than zero as well as zero.

Thanks for doing this. I'm already using it with "diff" as in "svn diff -c
17054", and very glad to have it.

- Julian

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 27 15:07:30 2005

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.